GIT: unionfs2-2.6.27.y: Unionfs: Kconfig and Makefile

[Erez Zadok]

commit 8ab774c41cefb83536548d6214368e0b60662ed1
Author: Josef "Jeff" Sipek <jsipek at cs.sunysb.edu>
Date:   Sun Jan 28 15:10:20 2007 -0500

    Unionfs: Kconfig and Makefile
    
    This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers
    file for Unionfs.
    
    Signed-off-by: Josef "Jeff" Sipek <jsipek at cs.sunysb.edu>
    Signed-off-by: David Quigley <dquigley at fsl.cs.sunysb.edu>
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

diff --git a/MAINTAINERS b/MAINTAINERS
index ff24d01..937d1b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4144,6 +4144,13 @@ L:	linux-kernel at vger.kernel.org
 W:	http://www.kernel.dk
 S:	Maintained
 
+UNIONFS
+P:	Josef "Jeff" Sipek
+M:	jsipek at cs.sunysb.edu
+L:	unionfs at filesystems.org
+W:	http://www.unionfs.org
+S:	Maintained
+
 USB ACM DRIVER
 P:	Oliver Neukum
 M:	oliver at neukum.name
diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5d..43e781d 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1539,6 +1539,16 @@ config UFS_DEBUG
 	  Y here.  This will result in _many_ additional debugging messages to be
 	  written to the system log.
 
+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.
+
+	  See <http://www.unionfs.org> for details
+
 endmenu
 
 menuconfig NETWORK_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
index a1482a5..83b7139 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -122,3 +122,4 @@ obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
+obj-$(CONFIG_UNION_FS)		+= unionfs/
diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
new file mode 100644
index 0000000..25dd78f
--- /dev/null
+++ b/fs/unionfs/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_UNION_FS) += unionfs.o
+
+unionfs-y := 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