The patch titled ecryptfs: fs/Makefile and fs/Kconfig has been added to the -mm tree. Its filename is ecryptfs-fs-makefile-and-fs-kconfig.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Phillip Hellewell <phillip@xxxxxxxxxxxxxxxxxxxx> This patch modifies the fs/Kconfig and fs/Makefile files to incorporate eCryptfs into the kernel build. Signed-off-by: Phillip Hellewell <phillip@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/Kconfig | 18 ++++++++++++++++++ fs/Makefile | 1 + 2 files changed, 19 insertions(+) diff -puN fs/Kconfig~ecryptfs-fs-makefile-and-fs-kconfig fs/Kconfig --- devel/fs/Kconfig~ecryptfs-fs-makefile-and-fs-kconfig 2006-05-13 00:25:34.000000000 -0700 +++ devel-akpm/fs/Kconfig 2006-05-13 00:25:34.000000000 -0700 @@ -966,6 +966,24 @@ config AFFS_FS To compile this file system support as a module, choose M here: the module will be called affs. If unsure, say N. +config ECRYPT_FS + tristate "eCrypt filesystem layer support (EXPERIMENTAL)" + depends on EXPERIMENTAL && KEYS && CRYPTO + help + Encrypted filesystem that operates on the VFS layer. See + Documentation/ecryptfs.txt to learn more about eCryptfs. + + To compile this file system support as a module, choose M here: the + module will be called ecryptfs. + +config ECRYPT_DEBUG + bool "Enable eCryptfs debug mode" + depends on ECRYPT_FS + help + Turn on debugging code in eCryptfs. + + If unsure, say N. + config HFS_FS tristate "Apple Macintosh file system support (EXPERIMENTAL)" depends on EXPERIMENTAL diff -puN fs/Makefile~ecryptfs-fs-makefile-and-fs-kconfig fs/Makefile --- devel/fs/Makefile~ecryptfs-fs-makefile-and-fs-kconfig 2006-05-13 00:25:34.000000000 -0700 +++ devel-akpm/fs/Makefile 2006-05-13 00:25:34.000000000 -0700 @@ -70,6 +70,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/ obj-$(CONFIG_DEVFS_FS) += devfs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ obj-$(CONFIG_HFS_FS) += hfs/ +obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ obj-$(CONFIG_VXFS_FS) += freevxfs/ obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/ _ Patches currently in -mm which might be from phillip@xxxxxxxxxxxxxxxxxxxx are ecryptfs-fs-makefile-and-fs-kconfig.patch ecryptfs-documentation.patch ecryptfs-makefile.patch ecryptfs-main-module-functions.patch ecryptfs-header-declarations.patch ecryptfs-superblock-operations.patch ecryptfs-dentry-operations.patch ecryptfs-file-operations.patch ecryptfs-inode-operations.patch ecryptfs-mmap-operations.patch ecryptfs-keystore.patch ecryptfs-crypto-functions.patch ecryptfs-debug-functions.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