Author: arekm Date: Tue Mar 24 12:11:57 2009 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - updated for 2.6.29
---- Files affected: SOURCES: kernel-unionfs.patch (1.1.2.5 -> 1.1.2.6) ---- Diffs: ================================================================ Index: SOURCES/kernel-unionfs.patch diff -u SOURCES/kernel-unionfs.patch:1.1.2.5 SOURCES/kernel-unionfs.patch:1.1.2.6 --- SOURCES/kernel-unionfs.patch:1.1.2.5 Thu Mar 12 11:43:17 2009 +++ SOURCES/kernel-unionfs.patch Tue Mar 24 13:11:52 2009 @@ -550,77 +550,44 @@ UNSORTED BLOCK IMAGES (UBI) P: Artem Bityutskiy M: [email protected] -diff --git a/fs/Kconfig b/fs/Kconfig -index 522469a..03b3ebf 100644 ---- a/fs/Kconfig -+++ b/fs/Kconfig -@@ -752,6 +752,47 @@ config CONFIGFS_FS - - endmenu - -+menu "Layered filesystems" -+ -+config ECRYPT_FS -+ tristate "eCrypt filesystem layer support (EXPERIMENTAL)" -+ depends on EXPERIMENTAL && KEYS && CRYPTO && NET -+ help -+ Encrypted filesystem that operates on the VFS layer. See -+ <file:Documentation/filesystems/ecryptfs.txt> to learn more about -+ eCryptfs. Userspace components are required and can be -+ obtained from <http://ecryptfs.sf.net>. -+ -+ To compile this file system support as a module, choose M here: the -+ module will be called ecryptfs. -+ +--- /dev/null 2007-02-13 17:29:53.000000000 +0100 ++++ linux-2.6.29/fs/unionfs/Kconfig 2009-03-24 13:07:49.116382161 +0100 +@@ -0,0 +1,25 @@ +config UNION_FS -+ tristate "Union file system (EXPERIMENTAL)" -+ depends on EXPERIMENTAL -+ help -+ Unionfs is a stackable unification file system, which appears to -+ merge the contents of several directories (branches), while keeping -+ their physical content separate. ++ tristate "Union file system (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ help ++ Unionfs is a stackable unification file system, which appears to ++ merge the contents of several directories (branches), while keeping ++ their physical content separate. + -+ See <http://unionfs.filesystems.org> for details ++ See <http://unionfs.filesystems.org> for details + +config UNION_FS_XATTR -+ bool "Unionfs extended attributes" -+ depends on UNION_FS -+ help -+ Extended attributes are name:value pairs associated with inodes by -+ the kernel or by users (see the attr(5) manual page). ++ bool "Unionfs extended attributes" ++ depends on UNION_FS ++ help ++ Extended attributes are name:value pairs associated with inodes by ++ the kernel or by users (see the attr(5) manual page). + -+ If unsure, say N. ++ If unsure, say N. + +config UNION_FS_DEBUG -+ bool "Debug Unionfs" -+ depends on UNION_FS -+ help -+ If you say Y here, you can turn on debugging output from Unionfs. -+ -+endmenu -+ - menu "Miscellaneous filesystems" - - config ADFS_FS -@@ -804,18 +845,6 @@ 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 && NET -- help -- Encrypted filesystem that operates on the VFS layer. See -- <file:Documentation/filesystems/ecryptfs.txt> to learn more about -- eCryptfs. Userspace components are required and can be -- obtained from <http://ecryptfs.sf.net>. -- -- To compile this file system support as a module, choose M here: the -- module will be called ecryptfs. -- - config HFS_FS - tristate "Apple Macintosh file system support (EXPERIMENTAL)" - depends on BLOCK && EXPERIMENTAL ++ bool "Debug Unionfs" ++ depends on UNION_FS ++ help ++ If you say Y here, you can turn on debugging output from Unionfs. ++ +--- linux-2.6.29/fs/Kconfig~ 2009-03-24 13:06:08.609715416 +0100 ++++ linux-2.6.29/fs/Kconfig 2009-03-24 13:08:40.063033558 +0100 +@@ -246,6 +246,7 @@ + source "fs/adfs/Kconfig" + source "fs/affs/Kconfig" + source "fs/ecryptfs/Kconfig" ++source "fs/unionfs/Kconfig" + source "fs/hfs/Kconfig" + source "fs/hfsplus/Kconfig" + source "fs/befs/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index d9f8afe..e7b036c 100644 --- a/fs/Makefile ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-unionfs.patch?r1=1.1.2.5&r2=1.1.2.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
