packages: kernel/kernel.spec, kernel/kernel-aufs3.patch 3.4 aufs

arekm arekm at pld-linux.org
Wed May 23 12:10:57 CEST 2012


Author: arekm                        Date: Wed May 23 10:10:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
3.4 aufs

---- Files affected:
packages/kernel:
   kernel.spec (1.1049 -> 1.1050) , kernel-aufs3.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.1049 packages/kernel/kernel.spec:1.1050
--- packages/kernel/kernel.spec:1.1049	Wed May 23 11:49:25 2012
+++ packages/kernel/kernel.spec	Wed May 23 12:10:51 2012
@@ -224,11 +224,12 @@
 # Patch creation:
 # git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git
 # cd aufs3-standalone
-# git checkout -b aufs3.2 origin/aufs3.2
+# git checkout -b aufs3.4 origin/aufs3.4
 # cat aufs3-kbuild.patch aufs3-base.patch aufs3-standalone.patch > ~/rpm/packages/kernel/kernel-aufs3.patch
 # mkdir linux
 # cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs3.patch
+# drop hunk at the end of patch (hunk is patching include/linux/Kbuild with single line change)
 #
 Patch145:	kernel-aufs3.patch
 Patch146:	kernel-aufs2-unionfs.patch
@@ -708,7 +709,7 @@
 %patch101 -p1
 %endif
 
-# aufs2
+# aufs3
 %if %{with reiser4}
 %patch148 -p1
 %endif
@@ -1506,6 +1507,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1050  2012/05/23 10:10:51  arekm
+3.4 aufs
+
 Revision 1.1049  2012/05/23 09:49:25  baggins
 - use the --force, dracut
 

================================================================
Index: packages/kernel/kernel-aufs3.patch
diff -u packages/kernel/kernel-aufs3.patch:1.9 packages/kernel/kernel-aufs3.patch:1.10
--- packages/kernel/kernel-aufs3.patch:1.9	Mon May 21 11:14:57 2012
+++ packages/kernel/kernel-aufs3.patch	Wed May 23 12:10:52 2012
@@ -1,4 +1,4 @@
-aufs3.x-rcN kbuild patch
+aufs3.4 kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
 index f95ae3a..6d8a9a5 100644
@@ -33,10 +33,10 @@
  header-y += auto_fs.h
  header-y += auto_fs4.h
  header-y += auxvec.h
-aufs3.x-rcN base patch
+aufs3.4 base patch
 
 diff --git a/fs/namei.c b/fs/namei.c
-index 0062dd1..80bb0b9 100644
+index c427919..7ff959b 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
@@ -103,7 +103,7 @@
 +			 struct pipe_inode_info *pipe, size_t len,
 +			 unsigned int flags);
  #endif
-aufs3.x-rcN standalone patch
+aufs3.4 standalone patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
 index 70f2a0f..146a3d7 100644
@@ -131,7 +131,7 @@
  /*
   * Empty aops. Can be used for the cases where the user does not
 diff --git a/fs/namei.c b/fs/namei.c
-index 80bb0b9..3430ad3 100644
+index 7ff959b..b170167 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
@@ -362,7 +362,7 @@
  			    unsigned long prot)
 diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,37 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -403,7 +403,7 @@
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,24 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -431,7 +431,7 @@
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,162 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -597,7 +597,7 @@
 +about it. But currently I have implemented it in kernel space.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,226 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -827,7 +827,7 @@
 +dir, aufs reverts it after copy-up.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,106 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -937,7 +937,7 @@
 +   by over-mounting something (or another method).
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,76 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1017,7 +1017,7 @@
 +    same named entry on the upper branch.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,65 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1086,7 +1086,7 @@
 +  copyup policy.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1137,7 +1137,7 @@
 +switching the approach.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,59 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1200,7 +1200,7 @@
 +  lookup_one_len(), vfs_getattr(), encode_fh() and others.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,53 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1257,7 +1257,7 @@
 +initramfs will use it to replace the old one at the next boot.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,47 @@
 +
 +# Copyright (C) 2010-2011 Junjiro R. Okajima
@@ -1308,7 +1308,7 @@
 +vm_operations_struct for regular files only.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt linux/Documentation/filesystems/aufs/design/99plan.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/99plan.txt	2012-03-19 12:24:13.676467669 +0100
++++ linux/Documentation/filesystems/aufs/design/99plan.txt	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,96 @@
 +
 +# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1408,7 +1408,7 @@
 +Otherwise from /new.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
 --- /usr/share/empty/Documentation/filesystems/aufs/README	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README	2012-05-21 09:17:41.615986107 +0200
++++ linux/Documentation/filesystems/aufs/README	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,330 @@
 +
 +Aufs3 -- advanced multi layered unification filesystem version 3.x
@@ -1742,7 +1742,7 @@
 +# End: ;
 diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 --- /usr/share/empty/fs/aufs/aufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/aufs.h	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,60 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -1806,7 +1806,7 @@
 +#endif /* __AUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 --- /usr/share/empty/fs/aufs/branch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/branch.c	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,1169 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -2979,7 +2979,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 --- /usr/share/empty/fs/aufs/branch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/branch.h	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,230 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3213,7 +3213,7 @@
 +#endif /* __AUFS_BRANCH_H__ */
 diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 --- /usr/share/empty/fs/aufs/conf.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/conf.mk	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,38 @@
 +
 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -3255,7 +3255,7 @@
 +-include ${srctree}/${src}/conf_priv.mk
 diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 --- /usr/share/empty/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c	2012-05-21 09:17:41.662653844 +0200
++++ linux/fs/aufs/cpup.c	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,1084 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4343,7 +4343,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 --- /usr/share/empty/fs/aufs/cpup.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/cpup.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,81 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4428,7 +4428,7 @@
 +#endif /* __AUFS_CPUP_H__ */
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 --- /usr/share/empty/fs/aufs/dbgaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dbgaufs.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,334 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4766,7 +4766,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
 --- /usr/share/empty/fs/aufs/dbgaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dbgaufs.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4819,7 +4819,7 @@
 +#endif /* __DBGAUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 --- /usr/share/empty/fs/aufs/dcsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dcsub.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5066,7 +5066,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 --- /usr/share/empty/fs/aufs/dcsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dcsub.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,94 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5164,7 +5164,7 @@
 +#endif /* __AUFS_DCSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 --- /usr/share/empty/fs/aufs/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/debug.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,489 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5657,7 +5657,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 --- /usr/share/empty/fs/aufs/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h	2012-05-21 09:17:41.662653844 +0200
++++ linux/fs/aufs/debug.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,242 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5903,7 +5903,7 @@
 +#endif /* __AUFS_DEBUG_H__ */
 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 --- /usr/share/empty/fs/aufs/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dentry.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,1140 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -7047,7 +7047,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 --- /usr/share/empty/fs/aufs/dentry.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dentry.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,237 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -7288,7 +7288,7 @@
 +#endif /* __AUFS_DENTRY_H__ */
 diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 --- /usr/share/empty/fs/aufs/dinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dinfo.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,543 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -7835,7 +7835,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 --- /usr/share/empty/fs/aufs/dir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c	2012-05-21 09:17:41.662653844 +0200
++++ linux/fs/aufs/dir.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,636 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -8475,7 +8475,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 --- /usr/share/empty/fs/aufs/dir.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dir.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,137 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -8616,7 +8616,7 @@
 +#endif /* __AUFS_DIR_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dynop.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,377 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -8997,7 +8997,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
 --- /usr/share/empty/fs/aufs/dynop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/dynop.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,76 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -9077,7 +9077,7 @@
 +#endif /* __AUFS_DYNOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 --- /usr/share/empty/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/export.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,803 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -9884,7 +9884,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 --- /usr/share/empty/fs/aufs/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/file.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,676 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10564,7 +10564,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 --- /usr/share/empty/fs/aufs/file.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/file.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,298 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -10866,7 +10866,7 @@
 +#endif /* __AUFS_FILE_H__ */
 diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 --- /usr/share/empty/fs/aufs/finfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/finfo.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,156 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -11026,7 +11026,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 --- /usr/share/empty/fs/aufs/f_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/f_op.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,729 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -11759,7 +11759,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/f_op_sp.c linux/fs/aufs/f_op_sp.c
 --- /usr/share/empty/fs/aufs/f_op_sp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op_sp.c	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/f_op_sp.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,298 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -12061,7 +12061,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
 --- /usr/share/empty/fs/aufs/fstype.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/fstype.h	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,496 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -12561,7 +12561,7 @@
 +#endif /* __AUFS_FSTYPE_H__ */
 diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 --- /usr/share/empty/fs/aufs/hfsnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/hfsnotify.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,260 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -12825,7 +12825,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 --- /usr/share/empty/fs/aufs/hfsplus.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/hfsplus.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,57 @@
 +/*
 + * Copyright (C) 2010-2012 Junjiro R. Okajima
@@ -12886,7 +12886,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 --- /usr/share/empty/fs/aufs/hnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/hnotify.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,712 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -13602,7 +13602,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 --- /usr/share/empty/fs/aufs/iinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/iinfo.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,264 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -13870,7 +13870,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 --- /usr/share/empty/fs/aufs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/inode.c	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,471 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -14345,7 +14345,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 --- /usr/share/empty/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/inode.h	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,560 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -14909,7 +14909,7 @@
 +#endif /* __AUFS_INODE_H__ */
 diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 --- /usr/share/empty/fs/aufs/ioctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/ioctl.c	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,196 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -15109,7 +15109,7 @@
 +#endif
 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 --- /usr/share/empty/fs/aufs/i_op_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/i_op_add.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,712 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -15825,7 +15825,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c	2012-05-21 09:17:41.662653844 +0200
++++ linux/fs/aufs/i_op.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,993 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -16822,7 +16822,7 @@
 +};
 diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 --- /usr/share/empty/fs/aufs/i_op_del.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/i_op_del.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,478 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -17304,7 +17304,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 --- /usr/share/empty/fs/aufs/i_op_ren.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/i_op_ren.c	2012-05-22 09:06:08.867458905 +0200
 @@ -0,0 +1,1026 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -18334,7 +18334,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
 --- /usr/share/empty/fs/aufs/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/Kconfig	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,203 @@
 +config AUFS_FS
 +	tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -18541,7 +18541,7 @@
 +endif
 diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 --- /usr/share/empty/fs/aufs/loop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/loop.c	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,133 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -18678,7 +18678,7 @@
 +}
 diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 --- /usr/share/empty/fs/aufs/loop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/loop.h	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,50 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -18732,7 +18732,7 @@
 +#endif /* __AUFS_LOOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
 --- /usr/share/empty/fs/aufs/magic.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/magic.mk	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,54 @@
 +
 +# defined in ${srctree}/fs/fuse/inode.c
@@ -18790,7 +18790,7 @@
 +endif
 diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
 --- /usr/share/empty/fs/aufs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile	2012-03-19 12:24:13.679801090 +0100
++++ linux/fs/aufs/Makefile	2012-05-22 09:06:08.864125478 +0200
 @@ -0,0 +1,42 @@
 +
 +include ${src}/magic.mk
@@ -18836,7 +18836,7 @@
 +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
 diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 --- /usr/share/empty/fs/aufs/module.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/module.c	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,196 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -19036,7 +19036,7 @@
 +module_exit(aufs_exit);
 diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 --- /usr/share/empty/fs/aufs/module.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h	2012-03-19 12:24:13.683134508 +0100
++++ linux/fs/aufs/module.h	2012-05-22 09:06:08.870792417 +0200
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -19145,7 +19145,7 @@
 +#endif /* __AUFS_MODULE_H__ */
 diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 --- /usr/share/empty/fs/aufs/opts.c	1970-01-01 01:00:00.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/kernel/kernel.spec?r1=1.1049&r2=1.1050
    http://cvs.pld-linux.org/packages/kernel/kernel-aufs3.patch?r1=1.9&r2=1.10



More information about the pld-cvs-commit mailing list