[packages/kernel] - up to 3.7.2; update aufs3, vserver patches
arekm
arekm at pld-linux.org
Fri Jan 11 20:24:45 CET 2013
commit 7a9e40b8cd1840b2303a67fe3ffca1dab7d088af
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Jan 11 20:24:36 2013 +0100
- up to 3.7.2; update aufs3, vserver patches
kernel-aufs3.patch | 341 +++++-----
kernel-vserver-2.3.patch | 1671 +++++++++++++++++++++++-----------------------
kernel.spec | 6 +-
3 files changed, 1007 insertions(+), 1011 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2b46e9f..1f087d1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,9 +66,9 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 1
%define basever 3.7
-%define postver .1
+%define postver .2
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -182,7 +182,7 @@ Patch59: kernel-rndis_host-wm5.patch
# http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
Patch85: kernel-hostap.patch
-# http://vserver.13thfloor.at/Experimental/patch-3.7.1-vs2.3.5.3.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.7.1-vs2.3.5.5.diff
# note there are additional patches from above url:
# - *fix* are real fixes (we want these)
# - *feat* are new features/tests (we don't want these)
diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch
index c7c5594..64d4a4b 100644
--- a/kernel-aufs3.patch
+++ b/kernel-aufs3.patch
@@ -1,4 +1,4 @@
-aufs3.x-rcN kbuild patch
+aufs3.7 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index f95ae3a..6d8a9a5 100644
@@ -21,7 +21,7 @@ index 1d7af79..06db6eb 100644
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
+obj-$(CONFIG_AUFS_FS) += aufs/
-aufs3.x-rcN base patch
+aufs3.7 base patch
diff --git a/fs/file_table.c b/fs/file_table.c
index a72bf9d..dac6792 100644
@@ -37,10 +37,10 @@ index a72bf9d..dac6792 100644
/* SLAB cache for file structures */
static struct kmem_cache *filp_cachep __read_mostly;
diff --git a/fs/inode.c b/fs/inode.c
-index b03c719..ee497f9 100644
+index 64999f1..ad73fc3 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
+@@ -1503,7 +1503,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
@@ -78,10 +78,10 @@ index 13e5b47..f185c6c 100644
ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index b33cfc9..963a61b 100644
+index 75fe9a1..70a766ae 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
-@@ -2558,6 +2558,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
+@@ -2553,6 +2553,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
extern int inode_newsize_ok(const struct inode *, loff_t offset);
extern void setattr_copy(struct inode *inode, const struct iattr *attr);
@@ -104,7 +104,7 @@ index 09a545a..1ac5727 100644
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags);
#endif
-aufs3.x-rcN standalone patch
+aufs3.7 standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
index dac6792..e3f2c15 100644
@@ -128,7 +128,7 @@ index dac6792..e3f2c15 100644
/*
diff --git a/fs/inode.c b/fs/inode.c
-index ee497f9..5e7eee7 100644
+index ad73fc3..108ff2b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
@@ -139,7 +139,7 @@ index ee497f9..5e7eee7 100644
/*
* Empty aops. Can be used for the cases where the user does not
-@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+@@ -1519,6 +1520,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
mark_inode_dirty_sync(inode);
return 0;
}
@@ -382,7 +382,7 @@ index 8dcd4ae..6efe561 100644
{
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-12-13 20:41:10.424793346 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2012-08-26 08:39:00.753841216 +0200
@@ -0,0 +1,37 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -423,7 +423,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
+ 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-12-13 20:41:10.424793346 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2012-08-26 08:39:00.753841216 +0200
@@ -0,0 +1,24 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -451,10 +451,10 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
+ 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-12-13 20:41:10.424793346 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,162 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -617,10 +617,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
+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-12-13 20:41:10.424793346 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,226 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -847,10 +847,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
+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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,106 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -957,10 +957,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
+ 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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,76 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1037,10 +1037,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
+ 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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,65 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1106,10 +1106,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
+ 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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,47 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1157,10 +1157,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
+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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,59 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1220,10 +1220,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
+ 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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,53 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1277,10 +1277,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
+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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,47 @@
+
-+# Copyright (C) 2010-2011 Junjiro R. Okajima
++# Copyright (C) 2010-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1328,10 +1328,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
+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-12-13 20:41:10.428126759 +0100
++++ linux/Documentation/filesystems/aufs/design/99plan.txt 2013-01-11 19:46:12.632614518 +0100
@@ -0,0 +1,96 @@
+
-+# Copyright (C) 2005-2011 Junjiro R. Okajima
++# Copyright (C) 2005-2013 Junjiro R. Okajima
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
@@ -1428,7 +1428,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt linu
+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-12-13 20:41:10.424793346 +0100
++++ linux/Documentation/filesystems/aufs/README 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,333 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
@@ -1765,10 +1765,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
+# 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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/aufs.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,60 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -1829,10 +1829,10 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/branch.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,1172 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3005,10 +3005,10 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/branch.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,230 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -3239,7 +3239,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/conf.mk 2012-08-26 08:39:00.757174634 +0200
@@ -0,0 +1,38 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -3281,10 +3281,10 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/cpup.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,1085 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4370,10 +4370,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/cpup.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,81 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4455,10 +4455,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dbgaufs.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,334 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4793,10 +4793,10 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dbgaufs.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,49 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -4846,10 +4846,10 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dcsub.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,243 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5093,10 +5093,10 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dcsub.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,94 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5191,10 +5191,10 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/debug.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,490 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5685,10 +5685,10 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/debug.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,242 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -5931,10 +5931,10 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dentry.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,1060 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -6995,10 +6995,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
+};
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dentry.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,234 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7233,10 +7233,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dinfo.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,543 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -7780,10 +7780,10 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dir.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,633 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -8417,10 +8417,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
+};
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dir.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,137 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -8558,10 +8558,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dynop.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,379 @@
+/*
-+ * Copyright (C) 2010-2012 Junjiro R. Okajima
++ * Copyright (C) 2010-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -8941,10 +8941,10 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/dynop.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,76 @@
+/*
-+ * Copyright (C) 2010-2012 Junjiro R. Okajima
++ * Copyright (C) 2010-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9021,10 +9021,10 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/export.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,811 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -9836,10 +9836,10 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/file.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,683 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10523,10 +10523,10 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
+};
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/file.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,298 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10825,10 +10825,10 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
+#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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/finfo.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,156 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -10985,10 +10985,10 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/f_op.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,723 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -11712,10 +11712,10 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+};
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/f_op_sp.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,295 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12011,10 +12011,10 @@ diff -urN /usr/share/empty/fs/aufs/f_op_sp.c linux/fs/aufs/f_op_sp.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/fstype.h 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,481 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12496,10 +12496,10 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
+#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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/hfsnotify.c 2013-01-11 19:46:12.635947932 +0100
@@ -0,0 +1,257 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12757,10 +12757,10 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
+};
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/hfsplus.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,57 @@
+/*
-+ * Copyright (C) 2010-2012 Junjiro R. Okajima
++ * Copyright (C) 2010-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -12818,10 +12818,10 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/hnotify.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,713 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -13535,10 +13535,10 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/iinfo.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,276 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -13815,10 +13815,10 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/inode.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,488 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14307,10 +14307,10 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/inode.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,588 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -14377,7 +14377,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+struct au_vdir;
+struct au_iinfo {
+ spinlock_t ii_genspin;
-+ struct au_iigen ii_generation;
++ struct au_iigen ii_generation;
+ struct super_block *ii_hsb1; /* no get/put */
+
+ struct au_rwsem ii_rwsem;
@@ -14899,10 +14899,10 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
+#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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/ioctl.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,196 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15099,10 +15099,10 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+#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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/i_op_add.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,713 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -15816,10 +15816,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/i_op.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,1026 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -16846,10 +16846,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
+};
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/i_op_del.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,477 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -17327,10 +17327,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/i_op_ren.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,1026 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18357,7 +18357,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
+}
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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/Kconfig 2012-08-26 08:39:00.757174634 +0200
@@ -0,0 +1,203 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -18564,10 +18564,10 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
+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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/loop.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,133 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18701,10 +18701,10 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
+}
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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/loop.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,50 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -18755,7 +18755,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
+#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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/magic.mk 2012-08-26 08:39:00.760508065 +0200
@@ -0,0 +1,54 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
@@ -18813,7 +18813,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+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-12-13 20:41:10.428126759 +0100
++++ linux/fs/aufs/Makefile 2012-08-26 08:39:00.757174634 +0200
@@ -0,0 +1,42 @@
+
+include ${src}/magic.mk
@@ -18859,10 +18859,10 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
+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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/module.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,202 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19065,10 +19065,10 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
+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-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/module.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,105 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -19174,10 +19174,10 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
+#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
-+++ linux/fs/aufs/opts.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/opts.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,1677 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -20855,10 +20855,10 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
+}
diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
--- /usr/share/empty/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/opts.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,209 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21068,10 +21068,10 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
+#endif /* __AUFS_OPTS_H__ */
diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
--- /usr/share/empty/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/plink.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,511 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21583,10 +21583,10 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
+}
diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
--- /usr/share/empty/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/poll.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,56 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21643,10 +21643,10 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
+}
diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
--- /usr/share/empty/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/procfs.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,170 @@
+/*
-+ * Copyright (C) 2010-2012 Junjiro R. Okajima
++ * Copyright (C) 2010-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -21817,10 +21817,10 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
+}
diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
--- /usr/share/empty/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/rdu.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,384 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22205,10 +22205,10 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
+#endif
diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
--- /usr/share/empty/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/rwsem.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,188 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22397,10 +22397,10 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
+#endif /* __AUFS_RWSEM_H__ */
diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
--- /usr/share/empty/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/sbinfo.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,343 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22744,10 +22744,10 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
--- /usr/share/empty/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/spl.h 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/spl.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,62 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -22810,10 +22810,10 @@ diff -urN /usr/share/empty/fs/aufs/spl.h linux/fs/aufs/spl.h
+#endif /* __AUFS_SPL_H__ */
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/super.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,993 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -23807,10 +23807,10 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+};
diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
--- /usr/share/empty/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/super.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,546 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24357,10 +24357,10 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
+#endif /* __AUFS_SUPER_H__ */
diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
--- /usr/share/empty/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/sysaufs.c 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,105 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24466,10 +24466,10 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
--- /usr/share/empty/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/sysaufs.h 2013-01-11 19:46:12.639281345 +0100
@@ -0,0 +1,104 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24574,10 +24574,10 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
+#endif /* __SYSAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
--- /usr/share/empty/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/sysfs.c 2013-01-11 19:46:12.642614759 +0100
@@ -0,0 +1,257 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24835,10 +24835,10 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
+}
diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
--- /usr/share/empty/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c 2012-12-13 20:41:10.431460173 +0100
++++ linux/fs/aufs/sysrq.c 2013-01-11 19:46:12.642614759 +0100
@@ -0,0 +1,148 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -24987,10 +24987,10 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
+}
diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
--- /usr/share/empty/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/vdir.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,885 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -25876,10 +25876,10 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/vfsub.c 2013-01-11 19:46:12.642614759 +0100
@@ -0,0 +1,777 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -26657,10 +26657,10 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/vfsub.h 2013-01-11 19:46:12.642614759 +0100
@@ -0,0 +1,284 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -26945,10 +26945,10 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/wbr_policy.c 2013-01-11 19:46:12.642614759 +0100
@@ -0,0 +1,700 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -27649,10 +27649,10 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/whout.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,1042 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28695,10 +28695,10 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
+}
diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
--- /usr/share/empty/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/whout.h 2013-01-11 19:46:12.659281826 +0100
@@ -0,0 +1,88 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -28787,10 +28787,10 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
+#endif /* __AUFS_WHOUT_H__ */
diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
--- /usr/share/empty/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/wkq.c 2013-01-11 19:46:12.659281826 +0100
@@ -0,0 +1,214 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29005,10 +29005,10 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
+}
diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
--- /usr/share/empty/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/wkq.h 2013-01-11 19:46:12.659281826 +0100
@@ -0,0 +1,92 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -29101,10 +29101,10 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
+#endif /* __AUFS_WKQ_H__ */
diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
--- /usr/share/empty/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c 2012-12-13 20:41:10.434793588 +0100
++++ linux/fs/aufs/xino.c 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,1264 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -30369,10 +30369,10 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/linux/aufs_type.h linux/include/linux/aufs_type.h
--- /usr/share/empty/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/linux/aufs_type.h 2012-12-13 20:41:10.434793588 +0100
++++ linux/include/linux/aufs_type.h 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,19 @@
+/*
-+ * Copyright (C) 2012 Junjiro R. Okajima
++ * Copyright (C) 2012-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -30392,10 +30392,10 @@ diff -urN /usr/share/empty/include/linux/aufs_type.h linux/include/linux/aufs_ty
+#include <uapi/linux/aufs_type.h>
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2012-12-13 20:41:10.434793588 +0100
++++ linux/include/uapi/linux/aufs_type.h 2013-01-11 19:46:28.699667650 +0100
@@ -0,0 +1,233 @@
+/*
-+ * Copyright (C) 2005-2012 Junjiro R. Okajima
++ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
+ * This program, aufs is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -30435,7 +30435,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "3.x-rcN-20121210"
++#define AUFS_VERSION "3.7-20130107"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -30627,3 +30627,4 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#define AUFS_CTL_IBUSY _IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy)
+
+#endif /* __AUFS_TYPE_H__ */
+
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 6bf84d7..92ad059 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs2.3.5.4/Documentation/vserver/debug.txt
+diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs2.3.5.5/Documentation/vserver/debug.txt
--- linux-3.7.1/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/Documentation/vserver/debug.txt 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/Documentation/vserver/debug.txt 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.7.1/Documentation/vserver/debug.txt linux-3.7.1-vs
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.4/arch/alpha/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.5/arch/alpha/Kconfig
--- linux-3.7.1/arch/alpha/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/alpha/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/alpha/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -668,6 +668,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/Kconfig linux-3.7.1-vs2.3.5.4/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.5.5/arch/alpha/kernel/systbls.S
--- linux-3.7.1/arch/alpha/kernel/systbls.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/systbls.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/alpha/kernel/systbls.S 2012-12-18 15:13:16.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/systbls.S linux-3.7.1-vs2.3.
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/alpha/kernel/traps.c
--- linux-3.7.1/arch/alpha/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/alpha/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/alpha/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -193,9 +193,9 @@ diff -NurpP --minimal linux-3.7.1/arch/alpha/kernel/traps.c linux-3.7.1-vs2.3.5.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.4/arch/arm/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.5/arch/arm/Kconfig
--- linux-3.7.1/arch/arm/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/arm/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/arm/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2307,6 +2307,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/Kconfig linux-3.7.1-vs2.3.5.4/arch/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.4/arch/arm/kernel/calls.S
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.5/arch/arm/kernel/calls.S
--- linux-3.7.1/arch/arm/kernel/calls.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/calls.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/arm/kernel/calls.S 2012-12-18 15:13:16.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/calls.S linux-3.7.1-vs2.3.5.4/
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/arm/kernel/process.c
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.5/arch/arm/kernel/process.c
--- linux-3.7.1/arch/arm/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/arm/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -230,9 +230,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/process.c linux-3.7.1-vs2.3.5.
__show_regs(regs);
dump_stack();
}
-diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/arm/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/arm/kernel/traps.c
--- linux-3.7.1/arch/arm/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/arm/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/arm/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -249,8 +249,8 @@ static int __die(const char *str, int er
print_modules();
@@ -244,9 +244,9 @@ diff -NurpP --minimal linux-3.7.1/arch/arm/kernel/traps.c linux-3.7.1-vs2.3.5.4/
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.4/arch/cris/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.5/arch/cris/Kconfig
--- linux-3.7.1/arch/cris/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/cris/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/cris/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -256,9 +256,9 @@ diff -NurpP --minimal linux-3.7.1/arch/cris/Kconfig linux-3.7.1-vs2.3.5.4/arch/c
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.4/arch/h8300/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.5/arch/h8300/Kconfig
--- linux-3.7.1/arch/h8300/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/h8300/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/h8300/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -217,6 +217,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -268,9 +268,9 @@ diff -NurpP --minimal linux-3.7.1/arch/h8300/Kconfig linux-3.7.1-vs2.3.5.4/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.4/arch/ia64/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.5/arch/ia64/Kconfig
--- linux-3.7.1/arch/ia64/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/ia64/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/ia64/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -644,6 +644,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -280,9 +280,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/Kconfig linux-3.7.1-vs2.3.5.4/arch/i
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/entry.S
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/entry.S
--- linux-3.7.1/arch/ia64/kernel/entry.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/entry.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/entry.S 2012-12-18 15:13:16.000000000 +0000
@@ -1714,7 +1714,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -292,9 +292,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/entry.S linux-3.7.1-vs2.3.5.4
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/process.c
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/process.c
--- linux-3.7.1/arch/ia64/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -306,9 +306,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/process.c linux-3.7.1-vs2.3.5
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/ptrace.c
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/ptrace.c
--- linux-3.7.1/arch/ia64/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -317,9 +317,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/ptrace.c linux-3.7.1-vs2.3.5.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/traps.c
--- linux-3.7.1/arch/ia64/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/ia64/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/ia64/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.7.1/arch/ia64/kernel/traps.c linux-3.7.1-vs2.3.5.4
}
}
}
-diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/m32r/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/m32r/kernel/traps.c
--- linux-3.7.1/arch/m32r/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/m32r/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/m32r/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -359,9 +359,9 @@ diff -NurpP --minimal linux-3.7.1/arch/m32r/kernel/traps.c linux-3.7.1-vs2.3.5.4
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.4/arch/m68k/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.5/arch/m68k/Kconfig
--- linux-3.7.1/arch/m68k/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/m68k/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/m68k/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -135,6 +135,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -371,9 +371,9 @@ diff -NurpP --minimal linux-3.7.1/arch/m68k/Kconfig linux-3.7.1-vs2.3.5.4/arch/m
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.4/arch/mips/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.5/arch/mips/Kconfig
--- linux-3.7.1/arch/mips/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2574,6 +2574,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -383,9 +383,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/Kconfig linux-3.7.1-vs2.3.5.4/arch/m
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/mips/kernel/ptrace.c
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.5/arch/mips/kernel/ptrace.c
--- linux-3.7.1/arch/mips/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -404,9 +404,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/ptrace.c linux-3.7.1-vs2.3.5.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall32-o32.S
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall32-o32.S
--- linux-3.7.1/arch/mips/kernel/scall32-o32.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall32-o32.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall32-o32.S 2012-12-18 15:13:16.000000000 +0000
@@ -512,7 +512,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -416,9 +416,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall32-o32.S linux-3.7.1-vs2
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-64.S
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-64.S
--- linux-3.7.1/arch/mips/kernel/scall64-64.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-64.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-64.S 2012-12-18 15:13:16.000000000 +0000
@@ -351,7 +351,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -428,9 +428,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-64.S linux-3.7.1-vs2.
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-n32.S
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-n32.S
--- linux-3.7.1/arch/mips/kernel/scall64-n32.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-n32.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-n32.S 2012-12-18 15:13:16.000000000 +0000
@@ -350,7 +350,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -440,9 +440,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-n32.S linux-3.7.1-vs2
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-o32.S
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-o32.S
--- linux-3.7.1/arch/mips/kernel/scall64-o32.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/scall64-o32.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/scall64-o32.S 2012-12-18 15:13:16.000000000 +0000
@@ -469,7 +469,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -452,9 +452,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/scall64-o32.S linux-3.7.1-vs2
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/mips/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/mips/kernel/traps.c
--- linux-3.7.1/arch/mips/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/mips/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/mips/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -469,9 +469,9 @@ diff -NurpP --minimal linux-3.7.1/arch/mips/kernel/traps.c linux-3.7.1-vs2.3.5.4
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.4/arch/parisc/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.5/arch/parisc/Kconfig
--- linux-3.7.1/arch/parisc/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/parisc/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/parisc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -284,6 +284,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -481,9 +481,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/Kconfig linux-3.7.1-vs2.3.5.4/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/syscall_table.S
+diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1-vs2.3.5.5/arch/parisc/kernel/syscall_table.S
--- linux-3.7.1/arch/parisc/kernel/syscall_table.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/syscall_table.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/parisc/kernel/syscall_table.S 2012-12-18 15:13:16.000000000 +0000
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -493,9 +493,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/syscall_table.S linux-3.7.1
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/parisc/kernel/traps.c
--- linux-3.7.1/arch/parisc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/parisc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/parisc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/kernel/traps.c linux-3.7.1-vs2.3.5
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.4/arch/parisc/mm/fault.c
+diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.5/arch/parisc/mm/fault.c
--- linux-3.7.1/arch/parisc/mm/fault.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/parisc/mm/fault.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/parisc/mm/fault.c 2012-12-18 15:13:16.000000000 +0000
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -534,9 +534,9 @@ diff -NurpP --minimal linux-3.7.1/arch/parisc/mm/fault.c linux-3.7.1-vs2.3.5.4/a
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.4/arch/powerpc/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.5/arch/powerpc/Kconfig
--- linux-3.7.1/arch/powerpc/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/powerpc/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/powerpc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -1014,6 +1014,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/Kconfig linux-3.7.1-vs2.3.5.4/arc
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/powerpc/include/uapi/asm/unistd.h
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.5/arch/powerpc/include/uapi/asm/unistd.h
--- linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/powerpc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/powerpc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/include/uapi/asm/unistd.h linux-3
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/process.c
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.3.5.5/arch/powerpc/kernel/process.c
--- linux-3.7.1/arch/powerpc/kernel/process.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/powerpc/kernel/process.c 2012-12-18 15:13:16.000000000 +0000
@@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -573,9 +573,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/process.c linux-3.7.1-vs2.
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/traps.c
+diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.5.5/arch/powerpc/kernel/traps.c
--- linux-3.7.1/arch/powerpc/kernel/traps.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/powerpc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/powerpc/kernel/traps.c 2012-12-18 15:13:16.000000000 +0000
@@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -588,9 +588,9 @@ diff -NurpP --minimal linux-3.7.1/arch/powerpc/kernel/traps.c linux-3.7.1-vs2.3.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.4/arch/s390/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.5/arch/s390/Kconfig
--- linux-3.7.1/arch/s390/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/s390/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/s390/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -530,6 +530,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -600,9 +600,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/Kconfig linux-3.7.1-vs2.3.5.4/arch/s
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.5.4/arch/s390/include/asm/tlb.h
+diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.5.5/arch/s390/include/asm/tlb.h
--- linux-3.7.1/arch/s390/include/asm/tlb.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/s390/include/asm/tlb.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/s390/include/asm/tlb.h 2012-12-18 15:13:16.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -611,9 +611,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/include/asm/tlb.h linux-3.7.1-vs2.3.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/s390/include/uapi/asm/unistd.h
+diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.5/arch/s390/include/uapi/asm/unistd.h
--- linux-3.7.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/s390/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/s390/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -623,9 +623,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/include/uapi/asm/unistd.h linux-3.7.
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.4/arch/s390/kernel/ptrace.c
+diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.5/arch/s390/kernel/ptrace.c
--- linux-3.7.1/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/s390/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/s390/kernel/ptrace.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -634,9 +634,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/ptrace.c linux-3.7.1-vs2.3.5.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.5.4/arch/s390/kernel/syscalls.S
+diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.5.5/arch/s390/kernel/syscalls.S
--- linux-3.7.1/arch/s390/kernel/syscalls.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/s390/kernel/syscalls.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/s390/kernel/syscalls.S 2012-12-18 15:13:16.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.7.1/arch/s390/kernel/syscalls.S linux-3.7.1-vs2.3.
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.4/arch/sh/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.5/arch/sh/Kconfig
--- linux-3.7.1/arch/sh/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sh/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sh/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -945,6 +945,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sh/Kconfig linux-3.7.1-vs2.3.5.4/arch/sh/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.4/arch/sh/kernel/irq.c
+diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.5/arch/sh/kernel/irq.c
--- linux-3.7.1/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sh/kernel/irq.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sh/kernel/irq.c 2012-12-18 15:13:16.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sh/kernel/irq.c linux-3.7.1-vs2.3.5.4/arc
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.4/arch/sparc/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.5/arch/sparc/Kconfig
--- linux-3.7.1/arch/sparc/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sparc/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sparc/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -564,6 +564,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/Kconfig linux-3.7.1-vs2.3.5.4/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.4/arch/sparc/include/uapi/asm/unistd.h
+diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7.1-vs2.3.5.5/arch/sparc/include/uapi/asm/unistd.h
--- linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sparc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sparc/include/uapi/asm/unistd.h 2012-12-18 15:13:16.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -693,9 +693,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/include/uapi/asm/unistd.h linux-3.7
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_32.S
+diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2.3.5.5/arch/sparc/kernel/systbls_32.S
--- linux-3.7.1/arch/sparc/kernel/systbls_32.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_32.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sparc/kernel/systbls_32.S 2012-12-18 15:13:16.000000000 +0000
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -705,9 +705,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_32.S linux-3.7.1-vs2
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_64.S
+diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2.3.5.5/arch/sparc/kernel/systbls_64.S
--- linux-3.7.1/arch/sparc/kernel/systbls_64.S 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/sparc/kernel/systbls_64.S 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/sparc/kernel/systbls_64.S 2012-12-18 15:13:16.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -726,9 +726,9 @@ diff -NurpP --minimal linux-3.7.1/arch/sparc/kernel/systbls_64.S linux-3.7.1-vs2
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.4/arch/um/Kconfig.rest
+diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.5/arch/um/Kconfig.rest
--- linux-3.7.1/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/um/Kconfig.rest 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/um/Kconfig.rest 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -738,14 +738,14 @@ diff -NurpP --minimal linux-3.7.1/arch/um/Kconfig.rest linux-3.7.1-vs2.3.5.4/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/kern_constants.h linux-3.7.1-vs2.3.5.4/arch/um/include/shared/kern_constants.h
+diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/kern_constants.h linux-3.7.1-vs2.3.5.5/arch/um/include/shared/kern_constants.h
--- linux-3.7.1/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/um/include/shared/kern_constants.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/um/include/shared/kern_constants.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-3.7.1-vs2.3.5.4/arch/um/include/shared/user_constants.h
+diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-3.7.1-vs2.3.5.5/arch/um/include/shared/user_constants.h
--- linux-3.7.1/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/um/include/shared/user_constants.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/um/include/shared/user_constants.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ * DO NOT MODIFY.
@@ -787,9 +787,9 @@ diff -NurpP --minimal linux-3.7.1/arch/um/include/shared/user_constants.h linux-
+#define UM_PROT_WRITE 2 /* PROT_WRITE # */
+#define UM_PROT_EXEC 4 /* PROT_EXEC # */
+
-diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.4/arch/x86/Kconfig
+diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.5/arch/x86/Kconfig
--- linux-3.7.1/arch/x86/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/x86/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/x86/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -2248,6 +2248,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -799,9 +799,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/Kconfig linux-3.7.1-vs2.3.5.4/arch/x8
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_32.tbl
+diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-vs2.3.5.5/arch/x86/syscalls/syscall_32.tbl
--- linux-3.7.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_32.tbl 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/x86/syscalls/syscall_32.tbl 2012-12-18 15:13:16.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -811,9 +811,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_32.tbl linux-3.7.1-v
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_64.tbl
+diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-vs2.3.5.5/arch/x86/syscalls/syscall_64.tbl
--- linux-3.7.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/arch/x86/syscalls/syscall_64.tbl 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/arch/x86/syscalls/syscall_64.tbl 2012-12-18 15:13:16.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -823,9 +823,9 @@ diff -NurpP --minimal linux-3.7.1/arch/x86/syscalls/syscall_64.tbl linux-3.7.1-v
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.4/drivers/block/Kconfig
+diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.5/drivers/block/Kconfig
--- linux-3.7.1/drivers/block/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/block/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/block/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -840,9 +840,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/Kconfig linux-3.7.1-vs2.3.5.4/dr
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.4/drivers/block/Makefile
+diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.5/drivers/block/Makefile
--- linux-3.7.1/drivers/block/Makefile 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/block/Makefile 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/block/Makefile 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -851,9 +851,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/Makefile linux-3.7.1-vs2.3.5.4/d
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.4/drivers/block/loop.c
+diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.5/drivers/block/loop.c
--- linux-3.7.1/drivers/block/loop.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/block/loop.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/block/loop.c 2012-12-18 15:13:16.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/loop.c linux-3.7.1-vs2.3.5.4/dri
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.4/drivers/block/vroot.c
+diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.5/drivers/block/vroot.c
--- linux-3.7.1/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/block/vroot.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/block/vroot.c 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1204,9 +1204,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/block/vroot.c linux-3.7.1-vs2.3.5.4/dr
+
+#endif
+
-diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5.4/drivers/infiniband/Kconfig
+diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5.5/drivers/infiniband/Kconfig
--- linux-3.7.1/drivers/infiniband/Kconfig 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/infiniband/Kconfig 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/infiniband/Kconfig 2012-12-18 15:13:16.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1216,9 +1216,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/infiniband/Kconfig linux-3.7.1-vs2.3.5
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2.3.5.4/drivers/infiniband/core/addr.c
+diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2.3.5.5/drivers/infiniband/core/addr.c
--- linux-3.7.1/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/infiniband/core/addr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/infiniband/core/addr.c 2012-12-18 15:13:16.000000000 +0000
@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1228,9 +1228,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/infiniband/core/addr.c linux-3.7.1-vs2
if (ret)
goto put;
-diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.4/drivers/md/dm-ioctl.c
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.5/drivers/md/dm-ioctl.c
--- linux-3.7.1/drivers/md/dm-ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/md/dm-ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/md/dm-ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1316,9 +1316,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm-ioctl.c linux-3.7.1-vs2.3.5.4/dr
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.4/drivers/md/dm.c
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.5/drivers/md/dm.c
--- linux-3.7.1/drivers/md/dm.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/md/dm.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/md/dm.c 2012-12-18 15:13:16.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1392,9 +1392,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm.c linux-3.7.1-vs2.3.5.4/drivers/
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.4/drivers/md/dm.h
+diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.5/drivers/md/dm.h
--- linux-3.7.1/drivers/md/dm.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/md/dm.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/md/dm.h 2012-12-18 15:13:16.000000000 +0000
@@ -46,6 +46,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1404,9 +1404,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/md/dm.h linux-3.7.1-vs2.3.5.4/drivers/
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.4/drivers/net/tun.c
+diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.5/drivers/net/tun.c
--- linux-3.7.1/drivers/net/tun.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/net/tun.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/net/tun.c 2012-12-18 15:13:16.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1476,9 +1476,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/net/tun.c linux-3.7.1-vs2.3.5.4/driver
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.1-vs2.3.5.4/drivers/staging/csr/csr_wifi_hip_xbv.c
+diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7.1-vs2.3.5.5/drivers/staging/csr/csr_wifi_hip_xbv.c
--- linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-18 15:13:16.000000000 +0000
@@ -55,7 +55,7 @@ typedef struct
{
char t_name[4];
@@ -1515,9 +1515,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3
{
u8 buf[8];
s32 n;
-diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.4/drivers/tty/sysrq.c
+diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.5/drivers/tty/sysrq.c
--- linux-3.7.1/drivers/tty/sysrq.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/tty/sysrq.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/tty/sysrq.c 2012-12-18 15:13:16.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/input.h>
@@ -1569,9 +1569,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/tty/sysrq.c linux-3.7.1-vs2.3.5.4/driv
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.4/drivers/tty/tty_io.c
+diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.5/drivers/tty/tty_io.c
--- linux-3.7.1/drivers/tty/tty_io.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/drivers/tty/tty_io.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/drivers/tty/tty_io.c 2012-12-18 15:13:16.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1598,9 +1598,9 @@ diff -NurpP --minimal linux-3.7.1/drivers/tty/tty_io.c linux-3.7.1-vs2.3.5.4/dri
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.4/fs/attr.c
+diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.5/fs/attr.c
--- linux-3.7.1/fs/attr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/attr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/attr.c 2012-12-18 15:13:16.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1641,9 +1641,9 @@ diff -NurpP --minimal linux-3.7.1/fs/attr.c linux-3.7.1-vs2.3.5.4/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.4/fs/block_dev.c
+diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.5/fs/block_dev.c
--- linux-3.7.1/fs/block_dev.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/block_dev.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/block_dev.c 2012-12-18 15:13:16.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -1681,9 +1681,9 @@ diff -NurpP --minimal linux-3.7.1/fs/block_dev.c linux-3.7.1-vs2.3.5.4/fs/block_
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.4/fs/btrfs/ctree.h
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.5/fs/btrfs/ctree.h
--- linux-3.7.1/fs/btrfs/ctree.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/btrfs/ctree.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/btrfs/ctree.h 2012-12-18 15:13:16.000000000 +0000
@@ -692,11 +692,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1736,9 +1736,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/ctree.h linux-3.7.1-vs2.3.5.4/fs/btrf
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.4/fs/btrfs/disk-io.c
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.5/fs/btrfs/disk-io.c
--- linux-3.7.1/fs/btrfs/disk-io.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/btrfs/disk-io.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/btrfs/disk-io.c 2012-12-18 15:13:16.000000000 +0000
@@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1749,9 +1749,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/disk-io.c linux-3.7.1-vs2.3.5.4/fs/bt
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.4/fs/btrfs/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.5/fs/btrfs/inode.c
--- linux-3.7.1/fs/btrfs/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/btrfs/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/btrfs/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -1818,9 +1818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/inode.c linux-3.7.1-vs2.3.5.4/fs/btrf
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/btrfs/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.5/fs/btrfs/ioctl.c
--- linux-3.7.1/fs/btrfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/btrfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/btrfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1992,9 +1992,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/btrf
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.4/fs/btrfs/super.c
+diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.5/fs/btrfs/super.c
--- linux-3.7.1/fs/btrfs/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/btrfs/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/btrfs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -312,7 +312,7 @@ enum {
Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -2050,9 +2050,9 @@ diff -NurpP --minimal linux-3.7.1/fs/btrfs/super.c linux-3.7.1-vs2.3.5.4/fs/btrf
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.4/fs/char_dev.c
+diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.5/fs/char_dev.c
--- linux-3.7.1/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/char_dev.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/char_dev.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -2085,9 +2085,9 @@ diff -NurpP --minimal linux-3.7.1/fs/char_dev.c linux-3.7.1-vs2.3.5.4/fs/char_de
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.4/fs/dcache.c
+diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.5/fs/dcache.c
--- linux-3.7.1/fs/dcache.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/dcache.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/dcache.c 2012-12-18 15:13:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2139,9 +2139,9 @@ diff -NurpP --minimal linux-3.7.1/fs/dcache.c linux-3.7.1-vs2.3.5.4/fs/dcache.c
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.4/fs/devpts/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.5/fs/devpts/inode.c
--- linux-3.7.1/fs/devpts/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/devpts/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/devpts/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2229,9 +2229,9 @@ diff -NurpP --minimal linux-3.7.1/fs/devpts/inode.c linux-3.7.1-vs2.3.5.4/fs/dev
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.4/fs/ext2/balloc.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.5/fs/ext2/balloc.c
--- linux-3.7.1/fs/ext2/balloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/balloc.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/balloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2240,9 +2240,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/balloc.c linux-3.7.1-vs2.3.5.4/fs/ext2
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.4/fs/ext2/ext2.h
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.5/fs/ext2/ext2.h
--- linux-3.7.1/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/ext2.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/ext2.h 2012-12-18 15:13:16.000000000 +0000
@@ -244,8 +244,12 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */
#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */
@@ -2290,18 +2290,18 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ext2.h linux-3.7.1-vs2.3.5.4/fs/ext2/e
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.7.1/fs/ext2/file.c linux-3.7.1-vs2.3.5.4/fs/ext2/file.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/file.c linux-3.7.1-vs2.3.5.5/fs/ext2/file.c
--- linux-3.7.1/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.get_acl = ext2_get_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext2/ialloc.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.5/fs/ext2/ialloc.c
--- linux-3.7.1/fs/ext2/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/ialloc.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2318,9 +2318,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext2
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.4/fs/ext2/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.5/fs/ext2/inode.c
--- linux-3.7.1/fs/ext2/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2453,9 +2453,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/inode.c linux-3.7.1-vs2.3.5.4/fs/ext2/
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext2/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.5/fs/ext2/ioctl.c
--- linux-3.7.1/fs/ext2/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2505,9 +2505,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext2/
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.4/fs/ext2/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.5/fs/ext2/namei.c
--- linux-3.7.1/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2532,9 +2532,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/namei.c linux-3.7.1-vs2.3.5.4/fs/ext2/
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.4/fs/ext2/super.c
+diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.5/fs/ext2/super.c
--- linux-3.7.1/fs/ext2/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext2/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext2/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -395,7 +395,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2600,9 +2600,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext2/super.c linux-3.7.1-vs2.3.5.4/fs/ext2/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.4/fs/ext3/ext3.h
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.5/fs/ext3/ext3.h
--- linux-3.7.1/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/ext3.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/ext3.h 2012-12-18 15:13:16.000000000 +0000
@@ -151,10 +151,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -2654,9 +2654,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ext3.h linux-3.7.1-vs2.3.5.4/fs/ext3/e
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.4/fs/ext3/file.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.5/fs/ext3/file.c
--- linux-3.7.1/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
@@ -2664,9 +2664,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/file.c linux-3.7.1-vs2.3.5.4/fs/ext3/f
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext3/ialloc.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.5/fs/ext3/ialloc.c
--- linux-3.7.1/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/ialloc.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2683,9 +2683,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext3
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.4/fs/ext3/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.5/fs/ext3/inode.c
--- linux-3.7.1/fs/ext3/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -27,6 +27,8 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -2818,9 +2818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/inode.c linux-3.7.1-vs2.3.5.4/fs/ext3/
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext3/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.5/fs/ext3/ioctl.c
--- linux-3.7.1/fs/ext3/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2888,9 +2888,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext3/
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.4/fs/ext3/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.5/fs/ext3/namei.c
--- linux-3.7.1/fs/ext3/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2916,9 +2916,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/namei.c linux-3.7.1-vs2.3.5.4/fs/ext3/
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.4/fs/ext3/super.c
+diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.5/fs/ext3/super.c
--- linux-3.7.1/fs/ext3/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext3/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext3/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -816,7 +816,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2985,9 +2985,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext3/super.c linux-3.7.1-vs2.3.5.4/fs/ext3/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.4/fs/ext4/ext4.h
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.5/fs/ext4/ext4.h
--- linux-3.7.1/fs/ext4/ext4.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/ext4.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/ext4.h 2012-12-18 15:13:16.000000000 +0000
@@ -392,8 +392,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -3034,9 +3034,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ext4.h linux-3.7.1-vs2.3.5.4/fs/ext4/e
/* move_extent.c */
extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
__u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.4/fs/ext4/file.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.5/fs/ext4/file.c
--- linux-3.7.1/fs/ext4/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_
#endif
.get_acl = ext4_get_acl,
@@ -3044,9 +3044,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/file.c linux-3.7.1-vs2.3.5.4/fs/ext4/f
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext4/ialloc.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.5/fs/ext4/ialloc.c
--- linux-3.7.1/fs/ext4/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/ialloc.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3063,9 +3063,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ialloc.c linux-3.7.1-vs2.3.5.4/fs/ext4
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.4/fs/ext4/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.5/fs/ext4/inode.c
--- linux-3.7.1/fs/ext4/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
@@ -3201,9 +3201,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/inode.c linux-3.7.1-vs2.3.5.4/fs/ext4/
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext4/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.5/fs/ext4/ioctl.c
--- linux-3.7.1/fs/ext4/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -14,12 +14,40 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3268,9 +3268,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ext4/
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.4/fs/ext4/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.5/fs/ext4/namei.c
--- linux-3.7.1/fs/ext4/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3295,9 +3295,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/namei.c linux-3.7.1-vs2.3.5.4/fs/ext4/
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.4/fs/ext4/super.c
+diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.5/fs/ext4/super.c
--- linux-3.7.1/fs/ext4/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ext4/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ext4/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -1222,7 +1222,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3363,9 +3363,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ext4/super.c linux-3.7.1-vs2.3.5.4/fs/ext4/
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.4/fs/fcntl.c
+diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.5/fs/fcntl.c
--- linux-3.7.1/fs/fcntl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/fcntl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/fcntl.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
@@ -3383,9 +3383,9 @@ diff -NurpP --minimal linux-3.7.1/fs/fcntl.c linux-3.7.1-vs2.3.5.4/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.4/fs/file.c
+diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.5/fs/file.c
--- linux-3.7.1/fs/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3440,9 +3440,9 @@ diff -NurpP --minimal linux-3.7.1/fs/file.c linux-3.7.1-vs2.3.5.4/fs/file.c
return fd;
-diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.4/fs/file_table.c
+diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.5/fs/file_table.c
--- linux-3.7.1/fs/file_table.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/file_table.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/file_table.c 2012-12-18 15:13:16.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3479,9 +3479,9 @@ diff -NurpP --minimal linux-3.7.1/fs/file_table.c linux-3.7.1-vs2.3.5.4/fs/file_
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.4/fs/fs_struct.c
+diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.5/fs/fs_struct.c
--- linux-3.7.1/fs/fs_struct.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/fs_struct.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/fs_struct.c 2012-12-18 15:13:16.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3506,9 +3506,9 @@ diff -NurpP --minimal linux-3.7.1/fs/fs_struct.c linux-3.7.1-vs2.3.5.4/fs/fs_str
}
return fs;
}
-diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.4/fs/gfs2/file.c
+diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.5/fs/gfs2/file.c
--- linux-3.7.1/fs/gfs2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/gfs2/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/gfs2/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.7.1/fs/gfs2/file.c linux-3.7.1-vs2.3.5.4/fs/gfs2/f
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/gfs2/inode.h
+diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.5/fs/gfs2/inode.h
--- linux-3.7.1/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/gfs2/inode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/gfs2/inode.h 2012-12-18 15:13:16.000000000 +0000
@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3642,9 +3642,9 @@ diff -NurpP --minimal linux-3.7.1/fs/gfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/gfs2/
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.4/fs/hostfs/hostfs.h
+diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.5/fs/hostfs/hostfs.h
--- linux-3.7.1/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/hostfs/hostfs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/hostfs/hostfs.h 2012-12-18 15:13:16.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3653,9 +3653,9 @@ diff -NurpP --minimal linux-3.7.1/fs/hostfs/hostfs.h linux-3.7.1-vs2.3.5.4/fs/ho
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.4/fs/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.5/fs/inode.c
--- linux-3.7.1/fs/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3718,9 +3718,9 @@ diff -NurpP --minimal linux-3.7.1/fs/inode.c linux-3.7.1-vs2.3.5.4/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.5/fs/ioctl.c
--- linux-3.7.1/fs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3731,9 +3731,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.4/fs/ioprio.c
+diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.5/fs/ioprio.c
--- linux-3.7.1/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ioprio.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ioprio.c 2012-12-18 15:13:16.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3760,9 +3760,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ioprio.c linux-3.7.1-vs2.3.5.4/fs/ioprio.c
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.4/fs/jfs/file.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.5/fs/jfs/file.c
--- linux-3.7.1/fs/jfs/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3781,9 +3781,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/file.c linux-3.7.1-vs2.3.5.4/fs/jfs/fil
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/jfs/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.5/fs/jfs/ioctl.c
--- linux-3.7.1/fs/jfs/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3841,9 +3841,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/ioctl.c linux-3.7.1-vs2.3.5.4/fs/jfs/io
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_dinode.h
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_dinode.h
--- linux-3.7.1/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_dinode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_dinode.h 2012-12-18 15:13:16.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3860,9 +3860,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/j
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_filsys.h
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_filsys.h
--- linux-3.7.1/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_filsys.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_filsys.h 2012-12-18 15:13:16.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3871,9 +3871,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_filsys.h linux-3.7.1-vs2.3.5.4/fs/j
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_imap.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_imap.c
--- linux-3.7.1/fs/jfs/jfs_imap.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_imap.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_imap.c 2012-12-18 15:13:16.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3938,9 +3938,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_imap.c linux-3.7.1-vs2.3.5.4/fs/jfs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_inode.c
--- linux-3.7.1/fs/jfs/jfs_inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4014,9 +4014,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.c linux-3.7.1-vs2.3.5.4/fs/jf
}
/*
-diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.h
+diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_inode.h
--- linux-3.7.1/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/jfs_inode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/jfs_inode.h 2012-12-18 15:13:16.000000000 +0000
@@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
int fh_len, int fh_type);
@@ -4025,9 +4025,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/jfs_inode.h linux-3.7.1-vs2.3.5.4/fs/jf
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.4/fs/jfs/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.5/fs/jfs/namei.c
--- linux-3.7.1/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4052,9 +4052,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/namei.c linux-3.7.1-vs2.3.5.4/fs/jfs/na
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.4/fs/jfs/super.c
+diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.5/fs/jfs/super.c
--- linux-3.7.1/fs/jfs/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/jfs/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/jfs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -199,7 +199,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -4121,9 +4121,9 @@ diff -NurpP --minimal linux-3.7.1/fs/jfs/super.c linux-3.7.1-vs2.3.5.4/fs/jfs/su
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.4/fs/libfs.c
+diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.5/fs/libfs.c
--- linux-3.7.1/fs/libfs.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/libfs.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/libfs.c 2012-12-18 15:13:16.000000000 +0000
@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4169,9 +4169,9 @@ diff -NurpP --minimal linux-3.7.1/fs/libfs.c linux-3.7.1-vs2.3.5.4/fs/libfs.c
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.4/fs/locks.c
+diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.5/fs/locks.c
--- linux-3.7.1/fs/locks.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/locks.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/locks.c 2012-12-18 15:13:16.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4369,9 +4369,9 @@ diff -NurpP --minimal linux-3.7.1/fs/locks.c linux-3.7.1-vs2.3.5.4/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.4/fs/mount.h
+diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.5/fs/mount.h
--- linux-3.7.1/fs/mount.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/mount.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/mount.h 2012-12-18 15:13:16.000000000 +0000
@@ -46,6 +46,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
@@ -4380,9 +4380,9 @@ diff -NurpP --minimal linux-3.7.1/fs/mount.h linux-3.7.1-vs2.3.5.4/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.4/fs/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.5/fs/namei.c
--- linux-3.7.1/fs/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,14 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4930,9 +4930,9 @@ diff -NurpP --minimal linux-3.7.1/fs/namei.c linux-3.7.1-vs2.3.5.4/fs/namei.c
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.4/fs/namespace.c
+diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.5/fs/namespace.c
--- linux-3.7.1/fs/namespace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/namespace.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/namespace.c 2012-12-18 15:13:16.000000000 +0000
@@ -20,6 +20,11 @@
#include <linux/fs_struct.h> /* get_fs_root et.al. */
#include <linux/fsnotify.h> /* fsnotify_vfsmount_delete */
@@ -5119,9 +5119,9 @@ diff -NurpP --minimal linux-3.7.1/fs/namespace.c linux-3.7.1-vs2.3.5.4/fs/namesp
kfree(ns);
}
-diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.4/fs/nfs/client.c
+diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.5/fs/nfs/client.c
--- linux-3.7.1/fs/nfs/client.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfs/client.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfs/client.c 2012-12-18 15:13:16.000000000 +0000
@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5143,9 +5143,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/client.c linux-3.7.1-vs2.3.5.4/fs/nfs/c
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.4/fs/nfs/dir.c
+diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.5/fs/nfs/dir.c
--- linux-3.7.1/fs/nfs/dir.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfs/dir.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfs/dir.c 2012-12-18 15:13:16.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5162,9 +5162,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/dir.c linux-3.7.1-vs2.3.5.4/fs/nfs/dir.
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.4/fs/nfs/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.5/fs/nfs/inode.c
--- linux-3.7.1/fs/nfs/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfs/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfs/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5314,9 +5314,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/inode.c linux-3.7.1-vs2.3.5.4/fs/nfs/in
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfs/nfs3xdr.c
+diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.5/fs/nfs/nfs3xdr.c
--- linux-3.7.1/fs/nfs/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfs/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfs/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5462,9 +5462,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfs/
}
/*
-diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.4/fs/nfs/super.c
+diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.5/fs/nfs/super.c
--- linux-3.7.1/fs/nfs/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfs/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/nsproxy.h>
#include <linux/rcupdate.h>
@@ -5538,9 +5538,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfs/super.c linux-3.7.1-vs2.3.5.4/fs/nfs/su
/*
* options that take text values
-diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.4/fs/nfsd/auth.c
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.5/fs/nfsd/auth.c
--- linux-3.7.1/fs/nfsd/auth.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfsd/auth.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfsd/auth.c 2012-12-18 15:13:16.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5559,9 +5559,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/auth.c linux-3.7.1-vs2.3.5.4/fs/nfsd/a
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs3xdr.c
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.5/fs/nfsd/nfs3xdr.c
--- linux-3.7.1/fs/nfsd/nfs3xdr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfsd/nfs3xdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -5612,9 +5612,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs3xdr.c linux-3.7.1-vs2.3.5.4/fs/nfs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs4xdr.c
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.5/fs/nfsd/nfs4xdr.c
--- linux-3.7.1/fs/nfsd/nfs4xdr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfs4xdr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfsd/nfs4xdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5644,9 +5644,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfs4xdr.c linux-3.7.1-vs2.3.5.4/fs/nfs
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd/nfsxdr.c
+diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.5/fs/nfsd/nfsxdr.c
--- linux-3.7.1/fs/nfsd/nfsxdr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/nfsd/nfsxdr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/nfsd/nfsxdr.c 2012-12-18 15:13:16.000000000 +0000
@@ -6,6 +6,7 @@
#include "xdr.h"
@@ -5695,9 +5695,9 @@ diff -NurpP --minimal linux-3.7.1/fs/nfsd/nfsxdr.c linux-3.7.1-vs2.3.5.4/fs/nfsd
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/dlmglue.c
--- linux-3.7.1/fs/ocfs2/dlmglue.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/dlmglue.c 2012-12-18 15:13:16.000000000 +0000
@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(inode->i_uid);
@@ -5714,9 +5714,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.c linux-3.7.1-vs2.3.5.4/fs/oc
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.h
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.5/fs/ocfs2/dlmglue.h
--- linux-3.7.1/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/dlmglue.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/dlmglue.h 2012-12-18 15:13:16.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5727,9 +5727,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/dlmglue.h linux-3.7.1-vs2.3.5.4/fs/oc
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/file.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/file.c
--- linux-3.7.1/fs/ocfs2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/file.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/file.c 2012-12-18 15:13:16.000000000 +0000
@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5739,9 +5739,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/file.c linux-3.7.1-vs2.3.5.4/fs/ocfs2
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/inode.c
--- linux-3.7.1/fs/ocfs2/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5838,9 +5838,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.c linux-3.7.1-vs2.3.5.4/fs/ocfs
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.h
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.5/fs/ocfs2/inode.h
--- linux-3.7.1/fs/ocfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/inode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/inode.h 2012-12-18 15:13:16.000000000 +0000
@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5849,9 +5849,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/inode.h linux-3.7.1-vs2.3.5.4/fs/ocfs
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/ioctl.c
--- linux-3.7.1/fs/ocfs2/ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5915,9 +5915,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ioctl.c linux-3.7.1-vs2.3.5.4/fs/ocfs
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/namei.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/namei.c
--- linux-3.7.1/fs/ocfs2/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/namei.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/namei.c 2012-12-18 15:13:16.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5948,9 +5948,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/namei.c linux-3.7.1-vs2.3.5.4/fs/ocfs
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2.h
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.5/fs/ocfs2/ocfs2.h
--- linux-3.7.1/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/ocfs2.h 2012-12-18 15:13:16.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5959,9 +5959,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2.h linux-3.7.1-vs2.3.5.4/fs/ocfs
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2_fs.h
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.5/fs/ocfs2/ocfs2_fs.h
--- linux-3.7.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/ocfs2_fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/ocfs2_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -266,6 +266,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5974,9 +5974,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/ocfs2_fs.h linux-3.7.1-vs2.3.5.4/fs/o
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.4/fs/ocfs2/super.c
+diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.5/fs/ocfs2/super.c
--- linux-3.7.1/fs/ocfs2/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/ocfs2/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/ocfs2/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -6040,9 +6040,9 @@ diff -NurpP --minimal linux-3.7.1/fs/ocfs2/super.c linux-3.7.1-vs2.3.5.4/fs/ocfs
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.4/fs/open.c
+diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.5/fs/open.c
--- linux-3.7.1/fs/open.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/open.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/open.c 2012-12-18 15:13:16.000000000 +0000
@@ -30,6 +30,11 @@
#include <linux/fs_struct.h>
#include <linux/ima.h>
@@ -6114,9 +6114,9 @@ diff -NurpP --minimal linux-3.7.1/fs/open.c linux-3.7.1-vs2.3.5.4/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.4/fs/proc/array.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.5/fs/proc/array.c
--- linux-3.7.1/fs/proc/array.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/array.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/array.c 2012-12-18 15:13:16.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
@@ -6230,9 +6230,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/array.c linux-3.7.1-vs2.3.5.4/fs/proc/
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.4/fs/proc/base.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.5/fs/proc/base.c
--- linux-3.7.1/fs/proc/base.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/base.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/base.c 2012-12-18 15:13:16.000000000 +0000
@@ -85,6 +85,8 @@
#include <linux/fs_struct.h>
#include <linux/slab.h>
@@ -6393,9 +6393,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/base.c linux-3.7.1-vs2.3.5.4/fs/proc/b
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.4/fs/proc/generic.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.5/fs/proc/generic.c
--- linux-3.7.1/fs/proc/generic.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/generic.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/generic.c 2012-12-18 15:13:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6455,9 +6455,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/generic.c linux-3.7.1-vs2.3.5.4/fs/pro
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.4/fs/proc/inode.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.5/fs/proc/inode.c
--- linux-3.7.1/fs/proc/inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -457,6 +457,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6467,9 +6467,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/inode.c linux-3.7.1-vs2.3.5.4/fs/proc/
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.4/fs/proc/internal.h
+diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.5/fs/proc/internal.h
--- linux-3.7.1/fs/proc/internal.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/internal.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/internal.h 2012-12-18 15:13:16.000000000 +0000
@@ -11,6 +11,8 @@
#include <linux/sched.h>
@@ -6507,9 +6507,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/internal.h linux-3.7.1-vs2.3.5.4/fs/pr
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.4/fs/proc/loadavg.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.5/fs/proc/loadavg.c
--- linux-3.7.1/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/loadavg.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/loadavg.c 2012-12-18 15:13:16.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6539,9 +6539,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/loadavg.c linux-3.7.1-vs2.3.5.4/fs/pro
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.4/fs/proc/meminfo.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.5/fs/proc/meminfo.c
--- linux-3.7.1/fs/proc/meminfo.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/meminfo.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/meminfo.c 2012-12-18 15:13:16.000000000 +0000
@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6552,9 +6552,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/meminfo.c linux-3.7.1-vs2.3.5.4/fs/pro
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.4/fs/proc/root.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.5/fs/proc/root.c
--- linux-3.7.1/fs/proc/root.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/root.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/root.c 2012-12-18 15:13:16.000000000 +0000
@@ -19,9 +19,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6586,9 +6586,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/root.c linux-3.7.1-vs2.3.5.4/fs/proc/r
.name = "/proc",
};
-diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.4/fs/proc/stat.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.5/fs/proc/stat.c
--- linux-3.7.1/fs/proc/stat.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/stat.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/stat.c 2012-12-18 15:13:16.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6637,9 +6637,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/stat.c linux-3.7.1-vs2.3.5.4/fs/proc/s
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.4/fs/proc/uptime.c
+diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.5/fs/proc/uptime.c
--- linux-3.7.1/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc/uptime.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc/uptime.c 2012-12-18 15:13:16.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6659,9 +6659,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc/uptime.c linux-3.7.1-vs2.3.5.4/fs/proc
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.4/fs/proc_namespace.c
+diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.5/fs/proc_namespace.c
--- linux-3.7.1/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/proc_namespace.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/proc_namespace.c 2012-12-18 15:13:16.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
@@ -6777,9 +6777,9 @@ diff -NurpP --minimal linux-3.7.1/fs/proc_namespace.c linux-3.7.1-vs2.3.5.4/fs/p
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.4/fs/quota/dquot.c
+diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.5/fs/quota/dquot.c
--- linux-3.7.1/fs/quota/dquot.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/quota/dquot.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/quota/dquot.c 2012-12-18 15:13:16.000000000 +0000
@@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6818,9 +6818,9 @@ diff -NurpP --minimal linux-3.7.1/fs/quota/dquot.c linux-3.7.1-vs2.3.5.4/fs/quot
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.4/fs/quota/quota.c
+diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.5/fs/quota/quota.c
--- linux-3.7.1/fs/quota/quota.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/quota/quota.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/quota/quota.c 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6908,9 +6908,9 @@ diff -NurpP --minimal linux-3.7.1/fs/quota/quota.c linux-3.7.1-vs2.3.5.4/fs/quot
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.4/fs/stat.c
+diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.5/fs/stat.c
--- linux-3.7.1/fs/stat.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/stat.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/stat.c 2012-12-18 15:13:16.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6919,9 +6919,9 @@ diff -NurpP --minimal linux-3.7.1/fs/stat.c linux-3.7.1-vs2.3.5.4/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.4/fs/statfs.c
+diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.5/fs/statfs.c
--- linux-3.7.1/fs/statfs.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/statfs.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/statfs.c 2012-12-18 15:13:16.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6940,9 +6940,9 @@ diff -NurpP --minimal linux-3.7.1/fs/statfs.c linux-3.7.1-vs2.3.5.4/fs/statfs.c
return retval;
}
-diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.4/fs/super.c
+diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.5/fs/super.c
--- linux-3.7.1/fs/super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/super.c 2012-12-18 15:13:16.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6966,9 +6966,9 @@ diff -NurpP --minimal linux-3.7.1/fs/super.c linux-3.7.1-vs2.3.5.4/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.4/fs/sysfs/mount.c
+diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.5/fs/sysfs/mount.c
--- linux-3.7.1/fs/sysfs/mount.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/sysfs/mount.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/sysfs/mount.c 2012-12-18 15:13:16.000000000 +0000
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -6978,9 +6978,9 @@ diff -NurpP --minimal linux-3.7.1/fs/sysfs/mount.c linux-3.7.1-vs2.3.5.4/fs/sysf
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.4/fs/utimes.c
+diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.5/fs/utimes.c
--- linux-3.7.1/fs/utimes.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/utimes.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/utimes.c 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7010,9 +7010,9 @@ diff -NurpP --minimal linux-3.7.1/fs/utimes.c linux-3.7.1-vs2.3.5.4/fs/utimes.c
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.4/fs/xattr.c
+diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.5/fs/xattr.c
--- linux-3.7.1/fs/xattr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xattr.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xattr.c 2012-12-18 15:13:16.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -7030,9 +7030,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xattr.c linux-3.7.1-vs2.3.5.4/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_dinode.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_dinode.h
--- linux-3.7.1/fs/xfs/xfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_dinode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_dinode.h 2012-12-18 15:13:16.000000000 +0000
@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
__be32 di_nlink; /* number of links to file */
__be16 di_projid_lo; /* lower part of owner's project id */
@@ -7073,9 +7073,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_dinode.h linux-3.7.1-vs2.3.5.4/fs/x
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_fs.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_fs.h
--- linux-3.7.1/fs/xfs/xfs_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -7096,9 +7096,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_fs.h linux-3.7.1-vs2.3.5.4/fs/xfs/x
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ialloc.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ialloc.c
--- linux-3.7.1/fs/xfs/xfs_ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ialloc.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ialloc.c 2012-12-18 15:13:16.000000000 +0000
@@ -37,7 +37,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
@@ -7107,9 +7107,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ialloc.c linux-3.7.1-vs2.3.5.4/fs/x
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_inode.c
--- linux-3.7.1/fs/xfs/xfs_inode.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_inode.c 2012-12-18 15:13:16.000000000 +0000
@@ -16,6 +16,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -7284,9 +7284,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.c linux-3.7.1-vs2.3.5.4/fs/xf
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_inode.h
--- linux-3.7.1/fs/xfs/xfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_inode.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_inode.h 2012-12-18 15:13:16.000000000 +0000
@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
@@ -7307,9 +7307,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_inode.h linux-3.7.1-vs2.3.5.4/fs/xf
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ioctl.c
--- linux-3.7.1/fs/xfs/xfs_ioctl.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ioctl.c 2012-12-18 15:13:16.000000000 +0000
@@ -26,7 +26,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7378,9 +7378,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.c linux-3.7.1-vs2.3.5.4/fs/xf
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ioctl.h
--- linux-3.7.1/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_ioctl.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_ioctl.h 2012-12-18 15:13:16.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7394,9 +7394,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_ioctl.h linux-3.7.1-vs2.3.5.4/fs/xf
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_iops.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_iops.c
--- linux-3.7.1/fs/xfs/xfs_iops.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_iops.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_iops.c 2012-12-18 15:13:16.000000000 +0000
@@ -28,6 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7472,9 +7472,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_iops.c linux-3.7.1-vs2.3.5.4/fs/xfs
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_itable.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_itable.c
--- linux-3.7.1/fs/xfs/xfs_itable.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_itable.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_itable.c 2012-12-18 15:13:16.000000000 +0000
@@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -7483,9 +7483,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_itable.c linux-3.7.1-vs2.3.5.4/fs/x
buf->bs_size = dic->di_size;
buf->bs_atime.tv_sec = dic->di_atime.t_sec;
buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_linux.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_linux.h
--- linux-3.7.1/fs/xfs/xfs_linux.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_linux.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_linux.h 2012-12-18 15:13:16.000000000 +0000
@@ -121,6 +121,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7494,9 +7494,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_linux.h linux-3.7.1-vs2.3.5.4/fs/xf
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_log_recover.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_log_recover.c
--- linux-3.7.1/fs/xfs/xfs_log_recover.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_log_recover.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_log_recover.c 2012-12-18 15:13:16.000000000 +0000
@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2(
}
@@ -7507,9 +7507,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_log_recover.c linux-3.7.1-vs2.3.5.4
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_mount.h
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_mount.h
--- linux-3.7.1/fs/xfs/xfs_mount.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_mount.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_mount.h 2012-12-18 15:13:16.000000000 +0000
@@ -246,6 +246,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7518,9 +7518,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_mount.h linux-3.7.1-vs2.3.5.4/fs/xf
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_super.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_super.c
--- linux-3.7.1/fs/xfs/xfs_super.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_super.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_super.c 2012-12-18 15:13:16.000000000 +0000
@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7597,9 +7597,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_super.c linux-3.7.1-vs2.3.5.4/fs/xf
/*
* we must configure the block size in the superblock before we run the
* full mount process as the mount process can lookup and cache inodes.
-diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_vnodeops.c
+diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_vnodeops.c
--- linux-3.7.1/fs/xfs/xfs_vnodeops.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/fs/xfs/xfs_vnodeops.c 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/fs/xfs/xfs_vnodeops.c 2012-12-18 15:13:16.000000000 +0000
@@ -103,6 +103,77 @@ xfs_readlink_bmap(
return error;
}
@@ -7678,9 +7678,9 @@ diff -NurpP --minimal linux-3.7.1/fs/xfs/xfs_vnodeops.c linux-3.7.1-vs2.3.5.4/fs
int
xfs_readlink(
xfs_inode_t *ip,
-diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.4/include/linux/cred.h
+diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.5/include/linux/cred.h
--- linux-3.7.1/include/linux/cred.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/cred.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/cred.h 2012-12-18 15:13:16.000000000 +0000
@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
@@ -7721,18 +7721,18 @@ diff -NurpP --minimal linux-3.7.1/include/linux/cred.h linux-3.7.1-vs2.3.5.4/inc
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.7.1/include/linux/devpts_fs.h linux-3.7.1-vs2.3.5.4/include/linux/devpts_fs.h
+diff -NurpP --minimal linux-3.7.1/include/linux/devpts_fs.h linux-3.7.1-vs2.3.5.5/include/linux/devpts_fs.h
--- linux-3.7.1/include/linux/devpts_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/devpts_fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/devpts_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.4/include/linux/fs.h
+diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.5/include/linux/fs.h
--- linux-3.7.1/include/linux/fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7898,9 +7898,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/fs.h linux-3.7.1-vs2.3.5.4/inclu
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.4/include/linux/init_task.h
+diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.5/include/linux/init_task.h
--- linux-3.7.1/include/linux/init_task.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/init_task.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/init_task.h 2012-12-18 15:13:16.000000000 +0000
@@ -210,6 +210,10 @@ extern struct task_group root_task_group
INIT_TRACE_RECURSION \
INIT_TASK_RCU_PREEMPT(tsk) \
@@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/init_task.h linux-3.7.1-vs2.3.5.
}
-diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.4/include/linux/ipc.h
+diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.5/include/linux/ipc.h
--- linux-3.7.1/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/ipc.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/ipc.h 2012-12-18 15:13:16.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/ipc.h linux-3.7.1-vs2.3.5.4/incl
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.3.5.4/include/linux/ipc_namespace.h
+diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.3.5.5/include/linux/ipc_namespace.h
--- linux-3.7.1/include/linux/ipc_namespace.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/ipc_namespace.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/ipc_namespace.h 2012-12-18 15:13:16.000000000 +0000
@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
#if defined(CONFIG_IPC_NS)
@@ -7952,9 +7952,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/ipc_namespace.h linux-3.7.1-vs2.
}
static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.4/include/linux/loop.h
+diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.5/include/linux/loop.h
--- linux-3.7.1/include/linux/loop.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/loop.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/loop.h 2012-12-18 15:13:16.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -7963,9 +7963,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/loop.h linux-3.7.1-vs2.3.5.4/inc
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5.4/include/linux/memcontrol.h
+diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5.5/include/linux/memcontrol.h
--- linux-3.7.1/include/linux/memcontrol.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/memcontrol.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/memcontrol.h 2012-12-18 15:13:16.000000000 +0000
@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
@@ -7980,9 +7980,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/memcontrol.h linux-3.7.1-vs2.3.5
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.4/include/linux/mm_types.h
+diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.5/include/linux/mm_types.h
--- linux-3.7.1/include/linux/mm_types.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/mm_types.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/mm_types.h 2012-12-18 15:13:16.000000000 +0000
@@ -365,6 +365,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -7991,9 +7991,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mm_types.h linux-3.7.1-vs2.3.5.4
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.4/include/linux/mmzone.h
+diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.5/include/linux/mmzone.h
--- linux-3.7.1/include/linux/mmzone.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/mmzone.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/mmzone.h 2012-12-18 15:13:16.000000000 +0000
@@ -735,6 +735,13 @@ typedef struct pglist_data {
__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
})
@@ -8008,9 +8008,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mmzone.h linux-3.7.1-vs2.3.5.4/i
#include <linux/memory_hotplug.h>
extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.4/include/linux/mount.h
+diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.5/include/linux/mount.h
--- linux-3.7.1/include/linux/mount.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/mount.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/mount.h 2012-12-18 15:13:16.000000000 +0000
@@ -47,6 +47,9 @@ struct mnt_namespace;
#define MNT_INTERNAL 0x4000
@@ -8021,9 +8021,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/mount.h linux-3.7.1-vs2.3.5.4/in
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.4/include/linux/net.h
+diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.5/include/linux/net.h
--- linux-3.7.1/include/linux/net.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/net.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/net.h 2012-12-18 15:13:16.000000000 +0000
@@ -38,6 +38,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -8032,9 +8032,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/net.h linux-3.7.1-vs2.3.5.4/incl
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.4/include/linux/netdevice.h
+diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.5/include/linux/netdevice.h
--- linux-3.7.1/include/linux/netdevice.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/netdevice.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/netdevice.h 2012-12-18 15:13:16.000000000 +0000
@@ -1637,6 +1637,7 @@ extern void netdev_resync_ops(struct ne
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -8043,9 +8043,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/netdevice.h linux-3.7.1-vs2.3.5.
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int dev_restart(struct net_device *dev);
#ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.4/include/linux/nsproxy.h
+diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.5/include/linux/nsproxy.h
--- linux-3.7.1/include/linux/nsproxy.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/nsproxy.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/nsproxy.h 2012-12-18 15:13:16.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8095,9 +8095,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/nsproxy.h linux-3.7.1-vs2.3.5.4/
}
#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.4/include/linux/pid.h
+diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.5/include/linux/pid.h
--- linux-3.7.1/include/linux/pid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/pid.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/pid.h 2012-12-18 15:13:16.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -8116,9 +8116,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/pid.h linux-3.7.1-vs2.3.5.4/incl
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.4/include/linux/proc_fs.h
+diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.5/include/linux/proc_fs.h
--- linux-3.7.1/include/linux/proc_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/proc_fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/proc_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -54,6 +54,7 @@ struct proc_dir_entry {
nlink_t nlink;
kuid_t uid;
@@ -8154,9 +8154,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/proc_fs.h linux-3.7.1-vs2.3.5.4/
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.4/include/linux/quotaops.h
+diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.5/include/linux/quotaops.h
--- linux-3.7.1/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/quotaops.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/quotaops.h 2012-12-18 15:13:16.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8198,9 +8198,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/quotaops.h linux-3.7.1-vs2.3.5.4
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.4/include/linux/sched.h
+diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.5/include/linux/sched.h
--- linux-3.7.1/include/linux/sched.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/sched.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/sched.h 2012-12-18 15:13:16.000000000 +0000
@@ -1378,6 +1378,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -8247,9 +8247,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sched.h linux-3.7.1-vs2.3.5.4/in
}
-diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.4/include/linux/shmem_fs.h
+diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.5/include/linux/shmem_fs.h
--- linux-3.7.1/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/shmem_fs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/shmem_fs.h 2012-12-18 15:13:16.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
@@ -8260,9 +8260,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/shmem_fs.h linux-3.7.1-vs2.3.5.4
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.4/include/linux/stat.h
+diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.5/include/linux/stat.h
--- linux-3.7.1/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/stat.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/stat.h 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -8271,9 +8271,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/stat.h linux-3.7.1-vs2.3.5.4/inc
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/auth.h
+diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.5.5/include/linux/sunrpc/auth.h
--- linux-3.7.1/include/linux/sunrpc/auth.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/auth.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/sunrpc/auth.h 2012-12-18 15:13:16.000000000 +0000
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -8282,9 +8282,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/auth.h linux-3.7.1-vs2.3.
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/clnt.h
+diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.5.5/include/linux/sunrpc/clnt.h
--- linux-3.7.1/include/linux/sunrpc/clnt.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/sunrpc/clnt.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/sunrpc/clnt.h 2012-12-18 15:13:16.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8295,9 +8295,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sunrpc/clnt.h linux-3.7.1-vs2.3.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.4/include/linux/sysfs.h
+diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.5/include/linux/sysfs.h
--- linux-3.7.1/include/linux/sysfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/sysfs.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/sysfs.h 2012-12-18 15:13:16.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
@@ -8307,9 +8307,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/sysfs.h linux-3.7.1-vs2.3.5.4/in
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.4/include/linux/types.h
+diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.5/include/linux/types.h
--- linux-3.7.1/include/linux/types.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/types.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/types.h 2012-12-18 15:13:16.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -8320,9 +8320,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/types.h linux-3.7.1-vs2.3.5.4/in
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.4/include/linux/uidgid.h
+diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.5/include/linux/uidgid.h
--- linux-3.7.1/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/uidgid.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/uidgid.h 2012-12-18 15:13:16.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -8442,9 +8442,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/uidgid.h linux-3.7.1-vs2.3.5.4/i
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.4/include/linux/utsname.h
+diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.5/include/linux/utsname.h
--- linux-3.7.1/include/linux/utsname.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/utsname.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/utsname.h 2012-12-18 15:13:16.000000000 +0000
@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts
}
@@ -8471,9 +8471,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/utsname.h linux-3.7.1-vs2.3.5.4/
}
#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.4/include/linux/vroot.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.5/include/linux/vroot.h
--- linux-3.7.1/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vroot.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vroot.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8526,9 +8526,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vroot.h linux-3.7.1-vs2.3.5.4/in
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.4/include/linux/vs_base.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.5/include/linux/vs_base.h
--- linux-3.7.1/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_base.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_base.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -8540,9 +8540,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_base.h linux-3.7.1-vs2.3.5.4/
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5.4/include/linux/vs_context.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5.5/include/linux/vs_context.h
--- linux-3.7.1/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_context.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_context.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -8786,9 +8786,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_context.h linux-3.7.1-vs2.3.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.4/include/linux/vs_cowbl.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.5/include/linux/vs_cowbl.h
--- linux-3.7.1/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_cowbl.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_cowbl.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -8838,9 +8838,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_cowbl.h linux-3.7.1-vs2.3.5.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.4/include/linux/vs_cvirt.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.5/include/linux/vs_cvirt.h
--- linux-3.7.1/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_cvirt.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_cvirt.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -8892,9 +8892,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_cvirt.h linux-3.7.1-vs2.3.5.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.4/include/linux/vs_device.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.5/include/linux/vs_device.h
--- linux-3.7.1/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_device.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_device.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -8941,9 +8941,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_device.h linux-3.7.1-vs2.3.5.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.4/include/linux/vs_dlimit.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.5/include/linux/vs_dlimit.h
--- linux-3.7.1/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_dlimit.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_dlimit.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -9160,9 +9160,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_dlimit.h linux-3.7.1-vs2.3.5.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.5/include/linux/vs_inet.h
--- linux-3.7.1/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h 2013-01-04 22:27:45.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_inet.h 2013-01-04 23:27:50.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -9225,7 +9225,7 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/
+int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
+{
+ struct nx_addr_v4 *nxa;
-+ unsigned long flags;
++ unsigned long irqflags;
+ int ret = 1;
+
+ if (!nxi)
@@ -9250,13 +9250,13 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/
+ ret = 5;
+
+ /* check for v4 addresses */
-+ spin_lock_irqsave(&nxi->addr_lock, flags);
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (nxa = &nxi->v4; nxa; nxa = nxa->next)
+ if (v4_addr_match(nxa, addr, tmask))
+ goto out_unlock;
+ ret = 0;
+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, flags);
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
@@ -9275,16 +9275,16 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/
+int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
+{
+ struct nx_addr_v4 *ptr;
-+ unsigned long flags;
++ unsigned long irqflags;
+ int ret = 1;
+
-+ spin_lock_irqsave(&nxi->addr_lock, flags);
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (ptr = &nxi->v4; ptr; ptr = ptr->next)
+ if (v4_nx_addr_match(ptr, nxa, mask))
+ goto out_unlock;
+ ret = 0;
+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, flags);
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+ return ret;
+}
+
@@ -9528,9 +9528,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.4/
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.5/include/linux/vs_inet6.h
--- linux-3.7.1/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h 2013-01-04 22:28:58.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_inet6.h 2013-01-04 23:27:50.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -9575,19 +9575,19 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.4
+ const struct in6_addr *addr, uint16_t mask)
+{
+ struct nx_addr_v6 *nxa;
-+ unsigned long flags;
++ unsigned long irqflags;
+ int ret = 1;
+
+ if (!nxi)
+ goto out;
+
-+ spin_lock_irqsave(&nxi->addr_lock, flags);
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (nxa = &nxi->v6; nxa; nxa = nxa->next)
+ if (v6_addr_match(nxa, addr, mask))
+ goto out_unlock;
+ ret = 0;
+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, flags);
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+out:
+ vxdprintk(VXD_CBIT(net, 0),
+ "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
@@ -9606,16 +9606,16 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.4
+int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
+{
+ struct nx_addr_v6 *ptr;
-+ unsigned long flags;
++ unsigned long irqflags;
+ int ret = 1;
+
-+ spin_lock_irqsave(&nxi->addr_lock, flags);
++ spin_lock_irqsave(&nxi->addr_lock, irqflags);
+ for (ptr = &nxi->v6; ptr; ptr = ptr->next)
+ if (v6_nx_addr_match(ptr, nxa, mask))
+ goto out_unlock;
+ ret = 0;
+out_unlock:
-+ spin_unlock_irqrestore(&nxi->addr_lock, flags);
++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
+ return ret;
+}
+
@@ -9789,9 +9789,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.4/include/linux/vs_limit.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.5/include/linux/vs_limit.h
--- linux-3.7.1/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_limit.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_limit.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -9933,9 +9933,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_limit.h linux-3.7.1-vs2.3.5.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5.4/include/linux/vs_network.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5.5/include/linux/vs_network.h
--- linux-3.7.1/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_network.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_network.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10106,9 +10106,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_network.h linux-3.7.1-vs2.3.5
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.4/include/linux/vs_pid.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.5/include/linux/vs_pid.h
--- linux-3.7.1/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_pid.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_pid.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -10160,9 +10160,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_pid.h linux-3.7.1-vs2.3.5.4/i
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.4/include/linux/vs_sched.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.5/include/linux/vs_sched.h
--- linux-3.7.1/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_sched.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_sched.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -10204,9 +10204,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_sched.h linux-3.7.1-vs2.3.5.4
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.4/include/linux/vs_socket.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.5/include/linux/vs_socket.h
--- linux-3.7.1/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_socket.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_socket.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10275,9 +10275,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_socket.h linux-3.7.1-vs2.3.5.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.4/include/linux/vs_tag.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.5/include/linux/vs_tag.h
--- linux-3.7.1/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_tag.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_tag.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10326,9 +10326,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_tag.h linux-3.7.1-vs2.3.5.4/i
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.4/include/linux/vs_time.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.5/include/linux/vs_time.h
--- linux-3.7.1/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vs_time.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vs_time.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -10349,9 +10349,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vs_time.h linux-3.7.1-vs2.3.5.4/
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/base.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/base.h
--- linux-3.7.1/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/base.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/base.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,178 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -10531,9 +10531,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/base.h linux-3.7.1-vs2.3
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct.h
--- linux-3.7.1/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -10550,9 +10550,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct.h linux-3.7.1-vs2.
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_cmd.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_cmd.h
--- linux-3.7.1/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_cmd.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -10564,9 +10564,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_cmd.h linux-3.7.1-
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_def.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_def.h
--- linux-3.7.1/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_def.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_def.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -10611,9 +10611,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_def.h linux-3.7.1-
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_int.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_int.h
--- linux-3.7.1/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cacct_int.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cacct_int.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -10632,9 +10632,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cacct_int.h linux-3.7.1-
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/check.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/check.h
--- linux-3.7.1/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/check.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/check.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -10725,9 +10725,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/check.h linux-3.7.1-vs2.
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/context.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/context.h
--- linux-3.7.1/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/context.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/context.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
@@ -10839,9 +10839,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context.h linux-3.7.1-vs
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/context_cmd.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/context_cmd.h
--- linux-3.7.1/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/context_cmd.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
@@ -10876,9 +10876,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/context_cmd.h linux-3.7.
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt.h
--- linux-3.7.1/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -10898,9 +10898,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt.h linux-3.7.1-vs2.
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_cmd.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt_cmd.h
--- linux-3.7.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt_cmd.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
@@ -10915,9 +10915,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_cmd.h linux-3.7.1-
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_def.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt_def.h
--- linux-3.7.1/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/cvirt_def.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/cvirt_def.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
@@ -10999,9 +10999,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/cvirt_def.h linux-3.7.1-
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/debug.h
--- linux-3.7.1/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/debug.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,145 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
@@ -11148,9 +11148,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug.h linux-3.7.1-vs2.
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug_cmd.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/debug_cmd.h
--- linux-3.7.1/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000
++++ linux-3.7.1-vs2.3.5.5/include/linux/vserver/debug_cmd.h 2012-12-18 15:13:16.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
@@ -11189,9 +11189,9 @@ diff -NurpP --minimal linux-3.7.1/include/linux/vserver/debug_cmd.h linux-3.7.1-
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device.h linux-3.7.1-vs2.3.5.4/include/linux/vserver/device.h
+diff -NurpP --minimal linux-3.7.1/include/linux/vserver/device.h linux-3.7.1-vs2.3.5.5/include/linux/vserver/device.h
--- linux-3.7.1/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.7.1-vs2.3.5.4/include/linux/vserver/device.h 2012-12-18 15:13:16.000000000 +0000
<Skipped 2222 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7a9e40b8cd1840b2303a67fe3ffca1dab7d088af
More information about the pld-cvs-commit
mailing list