From: Josef "Jeff" Sipek <[EMAIL PROTECTED]> This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers file for Unionfs.
Signed-off-by: Josef "Jeff" Sipek <[EMAIL PROTECTED]> Signed-off-by: David Quigley <[EMAIL PROTECTED]> Signed-off-by: Erez Zadok <[EMAIL PROTECTED]> --- MAINTAINERS | 7 +++++++ fs/Kconfig | 10 ++++++++++ fs/Makefile | 1 + fs/unionfs/Makefile | 5 +++++ 4 files changed, 23 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2bd34ef..33dc1b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3241,6 +3241,13 @@ L: linux-kernel@vger.kernel.org W: http://www.kernel.dk S: Maintained +UNIONFS +P: Josef "Jeff" Sipek +M: [EMAIL PROTECTED] +L: [EMAIL PROTECTED] +W: http://www.unionfs.org +S: Maintained + USB ACM DRIVER P: Oliver Neukum M: [EMAIL PROTECTED] diff --git a/fs/Kconfig b/fs/Kconfig index 8cd2417..2e519f4 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1554,6 +1554,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 menu "Network File Systems" diff --git a/fs/Makefile b/fs/Makefile index b9ffa63..76c6acc 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -115,3 +115,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 -- 1.4.4.2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
