The patch titled
ecryptfs: asm/scatterlist.h -> linux/scatterlist.h
has been added to the -mm tree. Its filename is
ecryptfs-asm-scatterlisth-linux-scatterlisth.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ecryptfs: asm/scatterlist.h -> linux/scatterlist.h
From: Mike Halcrow <mhalcrow@xxxxxxxxxx>
Grab the scatterlist header from the right place.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/crypto.c | 1 -
fs/ecryptfs/keystore.c | 2 +-
fs/ecryptfs/mmap.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff -puN fs/ecryptfs/crypto.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/crypto.c
--- 25/fs/ecryptfs/crypto.c~ecryptfs-asm-scatterlisth-linux-scatterlisth Tue Jun 20 17:37:22 2006
+++ 25-akpm/fs/ecryptfs/crypto.c Tue Jun 20 17:37:22 2006
@@ -33,7 +33,6 @@
#include <linux/crypto.h>
#include <linux/file.h>
#include <linux/scatterlist.h>
-#include <asm/scatterlist.h>
#include "ecryptfs_kernel.h"
/**
diff -puN fs/ecryptfs/keystore.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/keystore.c
--- 25/fs/ecryptfs/keystore.c~ecryptfs-asm-scatterlisth-linux-scatterlisth Tue Jun 20 17:37:22 2006
+++ 25-akpm/fs/ecryptfs/keystore.c Tue Jun 20 17:37:22 2006
@@ -31,7 +31,7 @@
#include <linux/key.h>
#include <linux/random.h>
#include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include "ecryptfs_kernel.h"
/**
diff -puN fs/ecryptfs/mmap.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/mmap.c
--- 25/fs/ecryptfs/mmap.c~ecryptfs-asm-scatterlisth-linux-scatterlisth Tue Jun 20 17:37:22 2006
+++ 25-akpm/fs/ecryptfs/mmap.c Tue Jun 20 17:37:22 2006
@@ -31,7 +31,7 @@
#include <linux/mount.h>
#include <linux/file.h>
#include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include "ecryptfs_kernel.h"
struct kmem_cache *ecryptfs_lower_page_cache;
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-fs-makefile-and-fs-kconfig-remove-ecrypt_debug-from-fs-kconfig.patch
ecryptfs-documentation.patch
ecryptfs-makefile.patch
ecryptfs-main-module-functions.patch
ecryptfs-main-module-functions-uint16_t-u16.patch
ecryptfs-header-declarations.patch
ecryptfs-header-declarations-update.patch
ecryptfs-header-declarations-update-convert-signed-data-types-to-unsigned-data-types.patch
ecryptfs-header-declarations-remove-unnecessary-ifndefs.patch
ecryptfs-superblock-operations.patch
ecryptfs-dentry-operations.patch
ecryptfs-file-operations.patch
ecryptfs-file-operations-remove-null-==-syntax.patch
ecryptfs-file-operations-remove-extraneous-read-of-inode-size-from-header.patch
ecryptfs-file-operations-fix.patch
ecryptfs-file-operations-fix-premature-release-of-file_info-memory.patch
ecryptfs-inode-operations.patch
ecryptfs-mmap-operations.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-keystore.patch
ecryptfs-crypto-functions.patch
ecryptfs-debug-functions.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-convert-assert-to-bug_on.patch
ecryptfs-remove-unnecessary-null-checks.patch
ecryptfs-rewrite-ecryptfs_fsync.patch
ecryptfs-overhaul-file-locking.patch
ecryptfs-dont-muck-with-the-existing-nameidata-structures.patch
ecryptfs-asm-scatterlisth-linux-scatterlisth.patch
ecryptfs-support-for-larger-maximum-key-size.patch
ecryptfs-add-codes-for-additional-ciphers.patch
ecryptfs-unencrypted-key-size-based-on-encrypted-key-size.patch
ecryptfs-packet-and-key-management-update-for-variable-key-size.patch
ecryptfs-add-ecryptfs_-prefix-to-mount-options-key-size-parameter.patch
ecryptfs-set-the-key-size-from-the-default-for-the-mount.patch
ecryptfs-check-for-weak-keys.patch
ecryptfs-add-define-values-for-cipher-codes-from-rfc2440-openpgp.patch
ecryptfs-convert-bits-to-bytes.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-more-intelligent-use-of-tfm-objects.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
