head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.24.06.14.17;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.24.06.14.17;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.11.07.06.13.33;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.12.01.02.36.12;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.12.04.00.47.21;	author jsipek;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2006.12.11.14.23.59;	author jsipek;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2007.01.21.23.59.13;	author jsipek;	state Exp;
branches;
next	1.1.2.7;

1.1.2.7
date	2007.01.25.08.38.30;	author jsipek;	state Exp;
branches;
next	1.1.2.8;

1.1.2.8
date	2007.01.28.22.24.33;	author jsipek;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file makefile was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Move unionfs specific bits into a subdir
@
text
@a0 65
Unionfs: Kconfig and Makefile

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers
file for Unionfs.

Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
Signed-off-by: David Quigley <dquigley@@fsl.cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@@cs.sunysb.edu>

diff -r ef52d5c7c96c MAINTAINERS
--- a/MAINTAINERS	Sat Oct 07 17:40:32 2006 -0400
+++ b/MAINTAINERS	Sat Oct 07 17:40:32 2006 -0400
@@@@ -3023,6 +3023,13 @@@@ W:	http://www.kernel.dk
 W:	http://www.kernel.dk
 S:	Maintained
 
+UNIONFS
+P:	Josef "Jeff" Sipek
+M:	jsipek@@cs.sunysb.edu
+L:	unionfs@@filesystems.org
+W:	http://www.unionfs.org
+S:	Maintained
+
 USB ACM DRIVER
 P:	Oliver Neukum
 M:	oliver@@neukum.name
diff -r ef52d5c7c96c fs/Kconfig
--- a/fs/Kconfig	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/Kconfig	Sat Oct 07 17:46:36 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 "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
 
diff -r ef52d5c7c96c fs/Makefile
--- a/fs/Makefile	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/Makefile	Sat Oct 07 17:40:32 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 ef52d5c7c96c fs/unionfs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/Makefile	Sat Oct 07 17:46:06 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
@


1.1.2.2
log
@Git generates slightly different diffs - same information, just little
different
@
text
@d12 4
a15 5
diff --git a/MAINTAINERS b/MAINTAINERS
index d708702..42d0d27 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -3036,6 +3036,13 @@@@ L:	linux-kernel@@vger.kernel.org
d29 5
a33 5
diff --git a/fs/Kconfig b/fs/Kconfig
index 133dcc8..c53d46e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@@ -1557,6 +1557,16 @@@@ config UFS_DEBUG
d36 1
a36 1
 
d46 1
a46 1
+
d49 4
a52 6
 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/
d57 3
a59 5
diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
new file mode 100644
index 0000000..aad6e3b
--- /dev/null
+++ b/fs/unionfs/Makefile
@


1.1.2.3
log
@Remove git crud & nicer makefile
@
text
@d14 3
a16 5

diff -r fcf4ff29a270 MAINTAINERS
--- a/MAINTAINERS	Thu Nov 30 21:28:07 2006 -0500
+++ b/MAINTAINERS	Thu Nov 30 21:28:07 2006 -0500
@@@@ -3042,6 +3042,13 @@@@ W:	http://www.kernel.dk
d30 5
a34 5
diff -r fcf4ff29a270 fs/Kconfig
--- a/fs/Kconfig	Thu Nov 30 21:28:07 2006 -0500
+++ b/fs/Kconfig	Thu Nov 30 21:28:07 2006 -0500
@@@@ -1556,6 +1556,16 @@@@ config UFS_DEBUG
 	  If you are experiencing any problems with the UFS filesystem, say
d37 1
a37 1
+
d47 1
a47 1
 
d50 6
a55 4
diff -r fcf4ff29a270 fs/Makefile
--- a/fs/Makefile	Thu Nov 30 21:28:07 2006 -0500
+++ b/fs/Makefile	Thu Nov 30 21:28:07 2006 -0500
@@@@ -115,3 +115,4 @@@@ obj-$(CONFIG_DEBUG_FS)		+= debugfs/
d60 5
a64 3
diff -r fcf4ff29a270 fs/unionfs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/Makefile	Thu Nov 30 21:28:25 2006 -0500
d68 1
a68 1
+unionfs-y := subr.o dentry.o file.o inode.o main.o super.o \
@


1.1.2.4
log
@Remove git cruft and add 2 patch descriptions
@
text
@d12 3
@


1.1.2.5
log
@Folded unionfs-lkml-comments-jan
@
text
@d12 4
a15 4
diff -r 7a69099f7ffa MAINTAINERS
--- a/MAINTAINERS	Mon Dec 11 09:10:26 2006 -0500
+++ b/MAINTAINERS	Mon Dec 11 09:10:28 2006 -0500
@@@@ -3056,6 +3056,13 @@@@ W:	http://www.kernel.dk
d29 3
a31 3
diff -r 7a69099f7ffa fs/Kconfig
--- a/fs/Kconfig	Mon Dec 11 09:10:26 2006 -0500
+++ b/fs/Kconfig	Mon Dec 11 09:10:28 2006 -0500
d49 3
a51 3
diff -r 7a69099f7ffa fs/Makefile
--- a/fs/Makefile	Mon Dec 11 09:10:26 2006 -0500
+++ b/fs/Makefile	Mon Dec 11 09:10:28 2006 -0500
d57 1
a57 1
diff -r 7a69099f7ffa fs/unionfs/Makefile
d59 1
a59 1
+++ b/fs/unionfs/Makefile	Mon Dec 11 09:10:28 2006 -0500
@


1.1.2.6
log
@A. Bunk's patch, more akpm comments, new copyright
@
text
@d12 4
a15 5
diff --git a/MAINTAINERS b/MAINTAINERS
index 1b1491d..a6941aa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -3290,6 +3290,13 @@@@ L:	linux-kernel@@vger.kernel.org
d29 5
a33 5
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
d36 1
a36 1
 
d46 1
a46 1
+
d49 4
a52 6
 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/
d57 3
a59 5
diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
new file mode 100644
index 0000000..25dd78f
--- /dev/null
+++ b/fs/unionfs/Makefile
@


1.1.2.7
log
@Removed stale_inode.c & associated patches

stale_inode.c seemed to be completely superfluous, and needed to be synced
up with current version of bad_inode.c or dropped. Dropping is considerably
cleaner.
@
text
@d13 1
a13 1
index d6f04a8..c94d6f8 100644
d62 1
a62 1
index 0000000..ef02ca3
d69 2
a70 2
+	branchman.o rdstate.o copyup.o dirhelper.o rename.o \
+	unlink.o lookup.o commonfops.o dirfops.o sioq.o
@


1.1.2.8
log
@Remove stale_inode.c the proper way - separate patch
@
text
@d13 1
a13 1
index 1b1491d..a6941aa 100644
d62 1
a62 1
index 0000000..25dd78f
d69 2
a70 2
+	stale_inode.o branchman.o rdstate.o copyup.o dirhelper.o \
+	rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o
@


