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


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

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

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

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

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

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

1.1.2.6
date	2006.10.24.06.14.17;	author jsipek;	state dead;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Quilt patch directory import & few small fixes
@
text
@a0 65
Unionfs: Kconfig and Makefile

From: David Quigley <dquigley@@fsl.cs.sunysb.edu>

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

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

diff -r 130d96361b4b MAINTAINERS
--- a/MAINTAINERS	Sat Sep 16 17:33:40 2006 -0400
+++ b/MAINTAINERS	Sat Sep 16 17:33:43 2006 -0400
@@@@ -2921,6 +2921,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 130d96361b4b fs/Kconfig
--- a/fs/Kconfig	Sat Sep 16 17:33:40 2006 -0400
+++ b/fs/Kconfig	Sat Sep 16 17:33:43 2006 -0400
@@@@ -1393,6 +1393,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 "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
 
diff -r 130d96361b4b fs/Makefile
--- a/fs/Makefile	Sat Sep 16 17:33:40 2006 -0400
+++ b/fs/Makefile	Sat Sep 16 17:33:43 2006 -0400
@@@@ -102,3 +102,4 @@@@ obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+obj-$(CONFIG_UNION_FS)		+= unionfs/
diff -r 130d96361b4b fs/unionfs/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/Makefile	Sat Sep 16 17:33:43 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
@Make license comments clearer
@
text
@d12 4
a15 4
diff -r 23f17c4f9e37 MAINTAINERS
--- a/MAINTAINERS	Sat Sep 23 02:53:25 2006 -0400
+++ b/MAINTAINERS	Sat Sep 23 02:53:27 2006 -0400
@@@@ -2929,6 +2929,13 @@@@ W:	http://www.kernel.dk
d29 3
a31 3
diff -r 23f17c4f9e37 fs/Kconfig
--- a/fs/Kconfig	Sat Sep 23 02:53:25 2006 -0400
+++ b/fs/Kconfig	Sat Sep 23 02:53:27 2006 -0400
d49 3
a51 3
diff -r 23f17c4f9e37 fs/Makefile
--- a/fs/Makefile	Sat Sep 23 02:53:25 2006 -0400
+++ b/fs/Makefile	Sat Sep 23 02:53:27 2006 -0400
d57 1
a57 1
diff -r 23f17c4f9e37 fs/unionfs/Makefile
d59 1
a59 1
+++ b/fs/unionfs/Makefile	Sat Sep 23 02:53:27 2006 -0400
@


1.1.2.3
log
@Make unionfs copile with latest git
@
text
@d12 4
a15 4
diff -r 39b8ff4c34ba MAINTAINERS
--- a/MAINTAINERS	Wed Oct 04 20:14:53 2006 -0400
+++ b/MAINTAINERS	Wed Oct 04 20:14:53 2006 -0400
@@@@ -3003,6 +3003,13 @@@@ W:	http://www.kernel.dk
d29 4
a32 4
diff -r 39b8ff4c34ba fs/Kconfig
--- a/fs/Kconfig	Wed Oct 04 20:14:53 2006 -0400
+++ b/fs/Kconfig	Wed Oct 04 20:14:53 2006 -0400
@@@@ -1453,6 +1453,16 @@@@ config UFS_DEBUG
d49 5
a53 4
diff -r 39b8ff4c34ba fs/Makefile
--- a/fs/Makefile	Wed Oct 04 20:14:53 2006 -0400
+++ b/fs/Makefile	Wed Oct 04 20:16:07 2006 -0400
@@@@ -112,3 +112,4 @@@@ obj-$(CONFIG_DEBUG_FS)		+= debugfs/
a55 1
 obj-$(CONFIG_GFS2_FS)           += gfs2/
d57 1
a57 1
diff -r 39b8ff4c34ba fs/unionfs/Makefile
d59 1
a59 1
+++ b/fs/unionfs/Makefile	Wed Oct 04 20:14:53 2006 -0400
@


1.1.2.4
log
@More intent passing - the intent is wrong, but that should be easy to fix
Moved lookup_one_len_nd to be the second patch in the series
Make the patches little bit uniform
@
text
@d3 1
a3 1
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
d8 1
a9 1
Signed-off-by: David Quigley <dquigley@@fsl.cs.sunysb.edu>
@


1.1.2.5
log
@Reintroduce xattr code
@
text
@d12 4
a15 4
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
d29 3
a31 3
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
d38 1
a38 1
+	tristate "Union file system (EXPERIMENTAL)"
d49 3
a51 3
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
d57 1
a57 1
diff -r ef52d5c7c96c fs/unionfs/Makefile
d59 1
a59 1
+++ b/fs/unionfs/Makefile	Sat Oct 07 17:46:06 2006 -0400
@


1.1.2.6
log
@Move unionfs specific bits into a subdir
@
text
@@


