From: David Quigley <dquigley@xxxxxxxxxxxxxxxxx> This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers file for Unionfs. Signed-off-by: David Quigley <dquigley@xxxxxxxxxxxxxxxxx> Signed-off-by: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx> Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx> --- MAINTAINERS | 7 +++++++ fs/Kconfig | 10 ++++++++++ fs/Makefile | 1 + fs/unionfs/Makefile | 5 +++++ 4 files changed, 23 insertions(+) diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/fs/Kconfig linux-2.6-git-unionfs/fs/Kconfig --- linux-2.6-git/fs/Kconfig 2006-08-31 18:43:47.000000000 -0400 +++ linux-2.6-git-unionfs/fs/Kconfig 2006-08-31 19:04:00.000000000 -0400 @@ -1394,6 +1394,16 @@ 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 menu "Network File Systems" diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/fs/Makefile linux-2.6-git-unionfs/fs/Makefile --- linux-2.6-git/fs/Makefile 2006-08-31 18:43:47.000000000 -0400 +++ linux-2.6-git-unionfs/fs/Makefile 2006-08-31 19:04:00.000000000 -0400 @@ -102,3 +102,4 @@ obj-$(CONFIG_HPPFS) += hppfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ +obj-$(CONFIG_UNION_FS) += unionfs/ diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/fs/unionfs/Makefile linux-2.6-git-unionfs/fs/unionfs/Makefile --- linux-2.6-git/fs/unionfs/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6-git-unionfs/fs/unionfs/Makefile 2006-08-31 19:04:00.000000000 -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 diff -Nur -x linux-2.6-git/Documentation/dontdiff linux-2.6-git/MAINTAINERS linux-2.6-git-unionfs/MAINTAINERS --- linux-2.6-git/MAINTAINERS 2006-08-31 18:43:38.000000000 -0400 +++ linux-2.6-git-unionfs/MAINTAINERS 2006-08-31 19:03:49.000000000 -0400 @@ -2921,6 +2921,13 @@ 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 - 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
