The patch titled
unionfs: Kconfig and Makefile
has been added to the -mm tree. Its filename is
unionfs-kconfig-and-makefile.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: unionfs: Kconfig and Makefile
From: Josef "Jeff" Sipek <jsipek@xxxxxxxxxxxxx>
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
MAINTAINERS | 7 +++++++
fs/Kconfig | 10 ++++++++++
fs/Makefile | 1 +
fs/unionfs/Makefile | 5 +++++
4 files changed, 23 insertions(+)
diff -puN MAINTAINERS~unionfs-kconfig-and-makefile MAINTAINERS
--- a/MAINTAINERS~unionfs-kconfig-and-makefile
+++ a/MAINTAINERS
@@ -3294,6 +3294,13 @@ L: linux-kernel@xxxxxxxxxxxxxxx
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 -puN fs/Kconfig~unionfs-kconfig-and-makefile fs/Kconfig
--- a/fs/Kconfig~unionfs-kconfig-and-makefile
+++ a/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 -puN fs/Makefile~unionfs-kconfig-and-makefile fs/Makefile
--- a/fs/Makefile~unionfs-kconfig-and-makefile
+++ a/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 -puN /dev/null fs/unionfs/Makefile
--- /dev/null
+++ a/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
_
Patches currently in -mm which might be from jsipek@xxxxxxxxxxxxx are
unionfs-documentation.patch
lookup_one_len_nd-lookup_one_len-with-nameidata-argument.patch
unionfs-branch-management-functionality.patch
unionfs-common-file-operations.patch
unionfs-copyup-functionality.patch
unionfs-dentry-operations.patch
unionfs-file-operations.patch
unionfs-directory-file-operations.patch
unionfs-directory-manipulation-helper-functions.patch
unionfs-inode-operations.patch
unionfs-lookup-helper-functions.patch
unionfs-main-module-functions.patch
unionfs-readdir-state.patch
unionfs-rename.patch
unionfs-privileged-operations-workqueue.patch
unionfs-handling-of-stale-inodes.patch
unionfs-miscellaneous-helper-functions.patch
unionfs-superblock-operations.patch
unionfs-helper-macros-inlines.patch
unionfs-internal-include-file.patch
unionfs-include-file.patch
unionfs-unlink.patch
unionfs-kconfig-and-makefile.patch
unionfs-extended-attributes-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
