From: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx> This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers file for Unionfs. Signed-off-by: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx> Signed-off-by: David Quigley <dquigley@xxxxxxxxxxxxxxxxx> Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx> --- 4 files changed, 23 insertions(+) MAINTAINERS | 7 +++++++ fs/Kconfig | 10 ++++++++++ fs/Makefile | 1 + fs/unionfs/Makefile | 5 +++++ diff -r a20795e821a8 -r 81b3a65f58d6 MAINTAINERS --- a/MAINTAINERS Sat Oct 07 00:46:20 2006 -0400 +++ b/MAINTAINERS Sat Oct 07 00:46:20 2006 -0400 @@ -3003,6 +3003,13 @@ W: http://www.kernel.dk W: http://www.kernel.dk S: Maintained +UNIONFS +P: Josef "Jeff" Sipek +M: jsipek@xxxxxxxxxxxxx +L: unionfs@xxxxxxxxxxxxxxx +W: http://www.unionfs.org +S: Maintained + USB ACM DRIVER P: Oliver Neukum M: oliver@xxxxxxxxxxx diff -r a20795e821a8 -r 81b3a65f58d6 fs/Kconfig --- a/fs/Kconfig Sat Oct 07 00:46:20 2006 -0400 +++ b/fs/Kconfig Sat Oct 07 00:46:20 2006 -0400 @@ -1453,6 +1453,16 @@ config UFS_DEBUG If you are experiencing any problems with the UFS filesystem, say Y here. This will result in _many_ additional debugging messages to be written to the system log. + +config UNION_FS + tristate "Stackable namespace unification file system" + 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://www.unionfs.org> for details endmenu diff -r a20795e821a8 -r 81b3a65f58d6 fs/Makefile --- a/fs/Makefile Sat Oct 07 00:46:20 2006 -0400 +++ b/fs/Makefile Sat Oct 07 00:46:20 2006 -0400 @@ -112,3 +112,4 @@ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/ +obj-$(CONFIG_UNION_FS) += unionfs/ diff -r a20795e821a8 -r 81b3a65f58d6 fs/unionfs/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fs/unionfs/Makefile Sat Oct 07 00:46:20 2006 -0400 @@ -0,0 +1,5 @@ +obj-$(CONFIG_UNION_FS) += unionfs.o + +unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \ + stale_inode.o branchman.o rdstate.o copyup.o dirhelper.o \ + rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
