[packages/kernel] - vs up to patch-3.13.6-vs2.3.6.11.diff
arekm
arekm at pld-linux.org
Thu Mar 13 21:13:09 CET 2014
commit 98d9a5b13a9fdbeba1834fcecaa96ca73e073698
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Mar 13 21:12:54 2014 +0100
- vs up to patch-3.13.6-vs2.3.6.11.diff
kernel-aufs3.patch | 173 ++--
kernel-vserver-2.3.patch | 2404 +++++++++++++++++++++++-----------------------
kernel.spec | 2 +-
3 files changed, 1289 insertions(+), 1290 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b513bd9..28cb2aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -186,7 +186,7 @@ Patch85: kernel-hostap.patch
# http://www.linuxtv.org/wiki/index.php/TechniSat_CableStar_Combo_HD_CI#Patch
Patch90: kernel-technisat-combo-hd-ci.patch
-# http://vserver.13thfloor.at/Experimental/patch-3.13.1-vs2.3.6.10.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.13.6-vs2.3.6.11.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 503e063..6172294 100644
--- a/kernel-aufs3.patch
+++ b/kernel-aufs3.patch
@@ -400,7 +400,7 @@ index 15b6928..ae6eba6 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 2014-01-27 23:16:52.651751827 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2014-01-30 21:10:02.794146538 +0100
@@ -0,0 +1,50 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -454,7 +454,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 2014-01-27 23:16:52.651751827 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2014-01-30 21:10:02.794146538 +0100
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -489,7 +489,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,161 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -654,7 +654,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,242 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -900,7 +900,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
+For this purpose, use "aumvdown" command in aufs-util.git.
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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,105 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1009,7 +1009,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,75 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1088,7 +1088,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,64 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1156,7 +1156,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,46 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1206,7 +1206,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,58 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1268,7 +1268,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,52 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1324,7 +1324,7 @@ 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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,46 @@
+
+# Copyright (C) 2010-2014 Junjiro R. Okajima
@@ -1374,7 +1374,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/Documentation/filesystems/aufs/design/99plan.txt 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,95 @@
+
+# Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1473,7 +1473,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 2014-01-20 20:16:14.729463171 +0100
++++ linux/Documentation/filesystems/aufs/README 2014-01-30 21:10:02.807480310 +0100
@@ -0,0 +1,344 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
@@ -1821,7 +1821,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/aufs.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -1884,7 +1884,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/branch.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,1219 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -3107,7 +3107,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/branch.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -3375,7 +3375,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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/conf.mk 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,37 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -3416,7 +3416,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/cpup.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,1277 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -4697,7 +4697,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/cpup.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -4795,7 +4795,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/dbgaufs.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -5231,7 +5231,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/dbgaufs.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -5283,7 +5283,7 @@ 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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/dcsub.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -5530,7 +5530,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dcsub.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -5632,7 +5632,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/debug.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,517 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -6153,7 +6153,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/debug.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -6404,7 +6404,7 @@ 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 2014-01-27 23:16:52.701753487 +0100
++++ linux/fs/aufs/dentry.c 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,1081 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -7489,7 +7489,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dentry.h 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -7726,7 +7726,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dinfo.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,542 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -8272,7 +8272,7 @@ 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 2014-01-27 23:16:52.701753487 +0100
++++ linux/fs/aufs/dir.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,639 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -8915,7 +8915,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dir.h 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -9055,7 +9055,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dynop.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2010-2014 Junjiro R. Okajima
@@ -9438,7 +9438,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/dynop.h 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2010-2014 Junjiro R. Okajima
@@ -9517,7 +9517,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/export.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,831 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -10352,7 +10352,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/file.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,724 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -11080,7 +11080,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/file.h 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -11396,7 +11396,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/finfo.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -11556,7 +11556,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/f_op.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,718 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -12083,7 +12083,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+ if (unlikely(err))
+ goto out_reset;
+
-+ // au_vm_prfile_set(vma, file);
++ //au_vm_prfile_set(vma, file);
+ /* update without lock, I don't think it a problem */
+ fsstack_copy_attr_atime(file_inode(file), file_inode(h_file));
+ goto out_fput; /* success */
@@ -12278,7 +12278,7 @@ 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 2014-01-20 20:16:14.736130059 +0100
++++ linux/fs/aufs/f_op_sp.c 2014-01-30 21:10:02.830814411 +0100
@@ -0,0 +1,382 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -12664,7 +12664,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/fstype.h 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -13137,7 +13137,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/hfsnotify.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -13436,7 +13436,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/hfsplus.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-2014 Junjiro R. Okajima
@@ -13496,7 +13496,7 @@ 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 2014-01-27 23:16:52.711753818 +0100
++++ linux/fs/aufs/hnotify.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,710 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -14210,7 +14210,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/iinfo.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -14489,7 +14489,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/inode.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,491 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -14984,7 +14984,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/inode.h 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,599 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -15587,7 +15587,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/ioctl.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -15792,7 +15792,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/i_op_add.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,762 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -16558,7 +16558,7 @@ 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 2014-01-27 23:16:52.715087263 +0100
++++ linux/fs/aufs/i_op.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,1127 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -17689,7 +17689,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/i_op_del.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,506 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -18199,7 +18199,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/i_op_ren.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,1032 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -19235,7 +19235,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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/Kconfig 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,179 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -19418,7 +19418,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/loop.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -19567,7 +19567,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/loop.h 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -19623,7 +19623,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 2013-07-06 13:20:47.750198454 +0200
++++ linux/fs/aufs/magic.mk 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,54 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
@@ -19681,7 +19681,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 2014-01-20 20:16:14.732796615 +0100
++++ linux/fs/aufs/Makefile 2014-01-30 21:10:02.827480967 +0100
@@ -0,0 +1,42 @@
+
+include ${src}/magic.mk
@@ -19727,7 +19727,7 @@ 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 2014-01-20 20:16:14.739463504 +0100
++++ linux/fs/aufs/module.c 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -19933,7 +19933,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/module.h 2014-01-30 21:10:02.850815069 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -20041,7 +20041,7 @@ 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/mvdown.c linux/fs/aufs/mvdown.c
--- /usr/share/empty/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/mvdown.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,627 @@
+/*
+ * Copyright (C) 2011-2014 Junjiro R. Okajima
@@ -20672,7 +20672,7 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
+}
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 2014-01-27 23:16:52.715087263 +0100
++++ linux/fs/aufs/opts.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,1701 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -22377,7 +22377,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/opts.h 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -22591,7 +22591,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/plink.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,532 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -23127,7 +23127,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/poll.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -23186,7 +23186,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/procfs.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2010-2014 Junjiro R. Okajima
@@ -23359,7 +23359,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/rdu.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,388 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -23751,7 +23751,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/rwsem.h 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -23942,7 +23942,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/sbinfo.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -24297,7 +24297,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/spl.h 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -24412,7 +24412,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/super.c 2014-03-13 19:59:53.391752805 +0100
@@ -0,0 +1,1001 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -25403,7 +25403,7 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
+ aufs_write_unlock(sb->s_root);
+ au_nwt_flush(&sbinfo->si_nowait);
+ }
-+ generic_shutdown_super(sb);
++ kill_anon_super(sb);
+}
+
+struct file_system_type aufs_fs_type = {
@@ -25417,7 +25417,7 @@ 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 2014-01-20 20:16:14.742796949 +0100
++++ linux/fs/aufs/super.h 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,571 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -25992,7 +25992,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/sysaufs.c 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -26100,7 +26100,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/sysaufs.h 2014-01-30 21:10:02.857481956 +0100
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -26207,7 +26207,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/sysfs.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -26507,7 +26507,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/sysrq.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -26665,7 +26665,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/vdir.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,887 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -27556,7 +27556,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/vfsub.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,782 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -28342,7 +28342,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/vfsub.h 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -28628,7 +28628,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/wbr_policy.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,756 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -29388,7 +29388,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/whout.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,1052 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -30444,7 +30444,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/whout.h 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -30534,7 +30534,7 @@ 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 2014-01-20 20:16:14.749463838 +0100
++++ linux/fs/aufs/wkq.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -30750,7 +30750,7 @@ 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 2014-01-20 20:16:14.752797282 +0100
++++ linux/fs/aufs/wkq.h 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -30845,7 +30845,7 @@ 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 2014-01-20 20:16:14.752797282 +0100
++++ linux/fs/aufs/xino.c 2014-01-30 21:10:02.860815399 +0100
@@ -0,0 +1,1314 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -32163,7 +32163,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
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 2014-01-27 23:17:06.205534916 +0100
++++ linux/include/uapi/linux/aufs_type.h 2014-03-13 19:59:53.391752805 +0100
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
@@ -32206,7 +32206,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#include <linux/limits.h>
+
-+#define AUFS_VERSION "3.13-20140127"
++#define AUFS_VERSION "3.13-20140303"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -32446,3 +32446,4 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+ struct aufs_mvdown)
+
+#endif /* __AUFS_TYPE_H__ */
+
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 9a02699..954ecfa 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.13.1/Documentation/vserver/debug.txt linux-3.13.1-vs2.3.6.10/Documentation/vserver/debug.txt
---- linux-3.13.1/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/Documentation/vserver/debug.txt 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/Documentation/vserver/debug.txt linux-3.13.6-vs2.3.6.11/Documentation/vserver/debug.txt
+--- linux-3.13.6/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/Documentation/vserver/debug.txt 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.13.1/Documentation/vserver/debug.txt linux-3.13.1-
+ 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.13.1/arch/alpha/Kconfig linux-3.13.1-vs2.3.6.10/arch/alpha/Kconfig
---- linux-3.13.1/arch/alpha/Kconfig 2014-01-22 20:38:09.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/alpha/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/alpha/Kconfig linux-3.13.6-vs2.3.6.11/arch/alpha/Kconfig
+--- linux-3.13.6/arch/alpha/Kconfig 2014-01-22 20:38:09.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/alpha/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -735,6 +735,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.13.1/arch/alpha/Kconfig linux-3.13.1-vs2.3.6.10/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/alpha/kernel/systbls.S linux-3.13.1-vs2.3.6.10/arch/alpha/kernel/systbls.S
---- linux-3.13.1/arch/alpha/kernel/systbls.S 2013-11-25 15:44:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/alpha/kernel/systbls.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/alpha/kernel/systbls.S linux-3.13.6-vs2.3.6.11/arch/alpha/kernel/systbls.S
+--- linux-3.13.6/arch/alpha/kernel/systbls.S 2013-11-25 15:44:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/alpha/kernel/systbls.S 2014-01-31 20:38:03.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.13.1/arch/alpha/kernel/systbls.S linux-3.13.1-vs2.
.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.13.1/arch/alpha/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/alpha/kernel/traps.c
---- linux-3.13.1/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/alpha/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/alpha/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/alpha/kernel/traps.c
+--- linux-3.13.6/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/alpha/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -175,7 +175,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.13.1/arch/alpha/kernel/traps.c linux-3.13.1-vs2.3.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.13.1/arch/arm/Kconfig linux-3.13.1-vs2.3.6.10/arch/arm/Kconfig
---- linux-3.13.1/arch/arm/Kconfig 2014-01-22 20:38:10.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/arm/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/arm/Kconfig linux-3.13.6-vs2.3.6.11/arch/arm/Kconfig
+--- linux-3.13.6/arch/arm/Kconfig 2014-01-22 20:38:10.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/arm/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -2265,6 +2265,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.13.1/arch/arm/Kconfig linux-3.13.1-vs2.3.6.10/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/arm/kernel/calls.S linux-3.13.1-vs2.3.6.10/arch/arm/kernel/calls.S
---- linux-3.13.1/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/arm/kernel/calls.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/arm/kernel/calls.S linux-3.13.6-vs2.3.6.11/arch/arm/kernel/calls.S
+--- linux-3.13.6/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/arm/kernel/calls.S 2014-01-31 20:38:03.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.13.1/arch/arm/kernel/calls.S linux-3.13.1-vs2.3.6.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.13.1/arch/arm/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/arm/kernel/traps.c
---- linux-3.13.1/arch/arm/kernel/traps.c 2014-01-22 20:38:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/arm/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/arm/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/arm/kernel/traps.c
+--- linux-3.13.6/arch/arm/kernel/traps.c 2014-01-22 20:38:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/arm/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -247,8 +247,8 @@ static int __die(const char *str, int er
print_modules();
@@ -231,9 +231,9 @@ diff -NurpP --minimal linux-3.13.1/arch/arm/kernel/traps.c linux-3.13.1-vs2.3.6.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.13.1/arch/cris/Kconfig linux-3.13.1-vs2.3.6.10/arch/cris/Kconfig
---- linux-3.13.1/arch/cris/Kconfig 2014-01-22 20:38:15.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/cris/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/cris/Kconfig linux-3.13.6-vs2.3.6.11/arch/cris/Kconfig
+--- linux-3.13.6/arch/cris/Kconfig 2014-01-22 20:38:15.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/cris/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -561,6 +561,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-3.13.1/arch/cris/Kconfig linux-3.13.1-vs2.3.6.10/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/ia64/Kconfig linux-3.13.1-vs2.3.6.10/arch/ia64/Kconfig
---- linux-3.13.1/arch/ia64/Kconfig 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/ia64/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/ia64/Kconfig linux-3.13.6-vs2.3.6.11/arch/ia64/Kconfig
+--- linux-3.13.6/arch/ia64/Kconfig 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/ia64/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -641,6 +641,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-3.13.1/arch/ia64/Kconfig linux-3.13.1-vs2.3.6.10/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/entry.S linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/entry.S
---- linux-3.13.1/arch/ia64/kernel/entry.S 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/entry.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/ia64/kernel/entry.S linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/entry.S
+--- linux-3.13.6/arch/ia64/kernel/entry.S 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/entry.S 2014-01-31 20:38:03.000000000 +0000
@@ -1706,7 +1706,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/entry.S linux-3.13.1-vs2.3.6
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/ptrace.c linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/ptrace.c
---- linux-3.13.1/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/ia64/kernel/ptrace.c linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/ptrace.c
+--- linux-3.13.6/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -278,9 +278,9 @@ diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/ptrace.c linux-3.13.1-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/traps.c
---- linux-3.13.1/arch/ia64/kernel/traps.c 2013-11-25 15:44:20.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/ia64/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/ia64/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/traps.c
+--- linux-3.13.6/arch/ia64/kernel/traps.c 2013-11-25 15:44:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/ia64/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -305,9 +305,9 @@ diff -NurpP --minimal linux-3.13.1/arch/ia64/kernel/traps.c linux-3.13.1-vs2.3.6
}
}
}
-diff -NurpP --minimal linux-3.13.1/arch/m32r/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/m32r/kernel/traps.c
---- linux-3.13.1/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/m32r/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/m32r/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/m32r/kernel/traps.c
+--- linux-3.13.6/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/m32r/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -320,9 +320,9 @@ diff -NurpP --minimal linux-3.13.1/arch/m32r/kernel/traps.c linux-3.13.1-vs2.3.6
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.13.1/arch/m68k/Kconfig linux-3.13.1-vs2.3.6.10/arch/m68k/Kconfig
---- linux-3.13.1/arch/m68k/Kconfig 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/m68k/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/m68k/Kconfig linux-3.13.6-vs2.3.6.11/arch/m68k/Kconfig
+--- linux-3.13.6/arch/m68k/Kconfig 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/m68k/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -134,6 +134,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,9 +332,9 @@ diff -NurpP --minimal linux-3.13.1/arch/m68k/Kconfig linux-3.13.1-vs2.3.6.10/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/mips/Kconfig linux-3.13.1-vs2.3.6.10/arch/mips/Kconfig
---- linux-3.13.1/arch/mips/Kconfig 2014-01-22 20:38:16.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/Kconfig linux-3.13.6-vs2.3.6.11/arch/mips/Kconfig
+--- linux-3.13.6/arch/mips/Kconfig 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -2539,6 +2539,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/Kconfig linux-3.13.1-vs2.3.6.10/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/ptrace.c linux-3.13.1-vs2.3.6.10/arch/mips/kernel/ptrace.c
---- linux-3.13.1/arch/mips/kernel/ptrace.c 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/ptrace.c 2014-01-31 20:53:13.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/ptrace.c linux-3.13.6-vs2.3.6.11/arch/mips/kernel/ptrace.c
+--- linux-3.13.6/arch/mips/kernel/ptrace.c 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/ptrace.c 2014-01-31 20:53:13.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
@@ -365,9 +365,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/ptrace.c linux-3.13.1-vs2.3.
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.13.1/arch/mips/kernel/scall32-o32.S linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall32-o32.S
---- linux-3.13.1/arch/mips/kernel/scall32-o32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall32-o32.S 2014-01-31 20:48:18.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/scall32-o32.S linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall32-o32.S
+--- linux-3.13.6/arch/mips/kernel/scall32-o32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall32-o32.S 2014-01-31 20:48:18.000000000 +0000
@@ -491,7 +491,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
@@ -377,9 +377,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall32-o32.S linux-3.13.1-v
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-64.S linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-64.S
---- linux-3.13.1/arch/mips/kernel/scall64-64.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-64.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/scall64-64.S linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-64.S
+--- linux-3.13.6/arch/mips/kernel/scall64-64.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-64.S 2014-01-31 20:38:03.000000000 +0000
@@ -352,7 +352,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-64.S linux-3.13.1-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-n32.S linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-n32.S
---- linux-3.13.1/arch/mips/kernel/scall64-n32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-n32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/scall64-n32.S linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-n32.S
+--- linux-3.13.6/arch/mips/kernel/scall64-n32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-n32.S 2014-01-31 20:38:03.000000000 +0000
@@ -345,7 +345,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-n32.S linux-3.13.1-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-o32.S linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-o32.S
---- linux-3.13.1/arch/mips/kernel/scall64-o32.S 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/scall64-o32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/scall64-o32.S linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-o32.S
+--- linux-3.13.6/arch/mips/kernel/scall64-o32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/scall64-o32.S 2014-01-31 20:38:03.000000000 +0000
@@ -469,7 +469,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -413,9 +413,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/scall64-o32.S linux-3.13.1-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/mips/kernel/traps.c
---- linux-3.13.1/arch/mips/kernel/traps.c 2014-01-22 20:38:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/mips/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/mips/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/mips/kernel/traps.c
+--- linux-3.13.6/arch/mips/kernel/traps.c 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/mips/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -334,9 +334,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -430,9 +430,9 @@ diff -NurpP --minimal linux-3.13.1/arch/mips/kernel/traps.c linux-3.13.1-vs2.3.6
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.13.1/arch/parisc/Kconfig linux-3.13.1-vs2.3.6.10/arch/parisc/Kconfig
---- linux-3.13.1/arch/parisc/Kconfig 2014-01-22 20:38:18.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/parisc/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/parisc/Kconfig linux-3.13.6-vs2.3.6.11/arch/parisc/Kconfig
+--- linux-3.13.6/arch/parisc/Kconfig 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/parisc/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -320,6 +320,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -442,9 +442,9 @@ diff -NurpP --minimal linux-3.13.1/arch/parisc/Kconfig linux-3.13.1-vs2.3.6.10/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/parisc/kernel/syscall_table.S linux-3.13.1-vs2.3.6.10/arch/parisc/kernel/syscall_table.S
---- linux-3.13.1/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/parisc/kernel/syscall_table.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/parisc/kernel/syscall_table.S linux-3.13.6-vs2.3.6.11/arch/parisc/kernel/syscall_table.S
+--- linux-3.13.6/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/parisc/kernel/syscall_table.S 2014-01-31 20:38:03.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-3.13.1/arch/parisc/kernel/syscall_table.S linux-3.13
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.13.1/arch/parisc/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/parisc/kernel/traps.c
---- linux-3.13.1/arch/parisc/kernel/traps.c 2013-11-25 15:46:28.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/parisc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/parisc/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/parisc/kernel/traps.c
+--- linux-3.13.6/arch/parisc/kernel/traps.c 2013-11-25 15:46:28.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/parisc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -480,9 +480,9 @@ diff -NurpP --minimal linux-3.13.1/arch/parisc/kernel/traps.c linux-3.13.1-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.13.1/arch/parisc/mm/fault.c linux-3.13.1-vs2.3.6.10/arch/parisc/mm/fault.c
---- linux-3.13.1/arch/parisc/mm/fault.c 2014-01-22 20:38:18.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/parisc/mm/fault.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/parisc/mm/fault.c linux-3.13.6-vs2.3.6.11/arch/parisc/mm/fault.c
+--- linux-3.13.6/arch/parisc/mm/fault.c 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/parisc/mm/fault.c 2014-01-31 20:38:03.000000000 +0000
@@ -272,8 +272,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -495,9 +495,9 @@ diff -NurpP --minimal linux-3.13.1/arch/parisc/mm/fault.c linux-3.13.1-vs2.3.6.1
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.13.1/arch/powerpc/Kconfig linux-3.13.1-vs2.3.6.10/arch/powerpc/Kconfig
---- linux-3.13.1/arch/powerpc/Kconfig 2014-01-22 20:38:18.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/powerpc/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/powerpc/Kconfig linux-3.13.6-vs2.3.6.11/arch/powerpc/Kconfig
+--- linux-3.13.6/arch/powerpc/Kconfig 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/powerpc/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -1028,6 +1028,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -507,9 +507,9 @@ diff -NurpP --minimal linux-3.13.1/arch/powerpc/Kconfig linux-3.13.1-vs2.3.6.10/
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.13.1/arch/powerpc/include/uapi/asm/unistd.h linux-3.13.1-vs2.3.6.10/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.13.1/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/powerpc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/powerpc/include/uapi/asm/unistd.h linux-3.13.6-vs2.3.6.11/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.13.6/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/powerpc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.13.1/arch/powerpc/include/uapi/asm/unistd.h linux-
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.13.1/arch/powerpc/kernel/traps.c linux-3.13.1-vs2.3.6.10/arch/powerpc/kernel/traps.c
---- linux-3.13.1/arch/powerpc/kernel/traps.c 2014-01-22 20:38:23.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/powerpc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/powerpc/kernel/traps.c linux-3.13.6-vs2.3.6.11/arch/powerpc/kernel/traps.c
+--- linux-3.13.6/arch/powerpc/kernel/traps.c 2014-01-22 20:38:23.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/powerpc/kernel/traps.c 2014-01-31 20:38:03.000000000 +0000
@@ -1272,8 +1272,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -534,9 +534,9 @@ diff -NurpP --minimal linux-3.13.1/arch/powerpc/kernel/traps.c linux-3.13.1-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.13.1/arch/s390/Kconfig linux-3.13.1-vs2.3.6.10/arch/s390/Kconfig
---- linux-3.13.1/arch/s390/Kconfig 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/s390/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/s390/Kconfig linux-3.13.6-vs2.3.6.11/arch/s390/Kconfig
+--- linux-3.13.6/arch/s390/Kconfig 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/s390/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -649,6 +649,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.13.1/arch/s390/Kconfig linux-3.13.1-vs2.3.6.10/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/s390/include/asm/tlb.h linux-3.13.1-vs2.3.6.10/arch/s390/include/asm/tlb.h
---- linux-3.13.1/arch/s390/include/asm/tlb.h 2013-11-25 15:46:29.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/s390/include/asm/tlb.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/s390/include/asm/tlb.h linux-3.13.6-vs2.3.6.11/arch/s390/include/asm/tlb.h
+--- linux-3.13.6/arch/s390/include/asm/tlb.h 2013-11-25 15:46:29.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/s390/include/asm/tlb.h 2014-01-31 20:38:03.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -557,9 +557,9 @@ diff -NurpP --minimal linux-3.13.1/arch/s390/include/asm/tlb.h linux-3.13.1-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.13.1/arch/s390/include/uapi/asm/unistd.h linux-3.13.1-vs2.3.6.10/arch/s390/include/uapi/asm/unistd.h
---- linux-3.13.1/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/s390/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/s390/include/uapi/asm/unistd.h linux-3.13.6-vs2.3.6.11/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.13.6/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/s390/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -569,9 +569,9 @@ diff -NurpP --minimal linux-3.13.1/arch/s390/include/uapi/asm/unistd.h linux-3.1
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.13.1/arch/s390/kernel/ptrace.c linux-3.13.1-vs2.3.6.10/arch/s390/kernel/ptrace.c
---- linux-3.13.1/arch/s390/kernel/ptrace.c 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/s390/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/s390/kernel/ptrace.c linux-3.13.6-vs2.3.6.11/arch/s390/kernel/ptrace.c
+--- linux-3.13.6/arch/s390/kernel/ptrace.c 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/s390/kernel/ptrace.c 2014-01-31 20:38:03.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -580,9 +580,9 @@ diff -NurpP --minimal linux-3.13.1/arch/s390/kernel/ptrace.c linux-3.13.1-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.13.1/arch/s390/kernel/syscalls.S linux-3.13.1-vs2.3.6.10/arch/s390/kernel/syscalls.S
---- linux-3.13.1/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/s390/kernel/syscalls.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/s390/kernel/syscalls.S linux-3.13.6-vs2.3.6.11/arch/s390/kernel/syscalls.S
+--- linux-3.13.6/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/s390/kernel/syscalls.S 2014-01-31 20:38:03.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)
@@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.13.1/arch/s390/kernel/syscalls.S linux-3.13.1-vs2.
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.13.1/arch/sh/Kconfig linux-3.13.1-vs2.3.6.10/arch/sh/Kconfig
---- linux-3.13.1/arch/sh/Kconfig 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sh/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sh/Kconfig linux-3.13.6-vs2.3.6.11/arch/sh/Kconfig
+--- linux-3.13.6/arch/sh/Kconfig 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sh/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -927,6 +927,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sh/Kconfig linux-3.13.1-vs2.3.6.10/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/sh/kernel/irq.c linux-3.13.1-vs2.3.6.10/arch/sh/kernel/irq.c
---- linux-3.13.1/arch/sh/kernel/irq.c 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sh/kernel/irq.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sh/kernel/irq.c linux-3.13.6-vs2.3.6.11/arch/sh/kernel/irq.c
+--- linux-3.13.6/arch/sh/kernel/irq.c 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sh/kernel/irq.c 2014-01-31 20:38:03.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -615,9 +615,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sh/kernel/irq.c linux-3.13.1-vs2.3.6.10/
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.13.1/arch/sparc/Kconfig linux-3.13.1-vs2.3.6.10/arch/sparc/Kconfig
---- linux-3.13.1/arch/sparc/Kconfig 2014-01-22 20:38:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sparc/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sparc/Kconfig linux-3.13.6-vs2.3.6.11/arch/sparc/Kconfig
+--- linux-3.13.6/arch/sparc/Kconfig 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sparc/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -553,6 +553,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -627,9 +627,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sparc/Kconfig linux-3.13.1-vs2.3.6.10/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/sparc/include/uapi/asm/unistd.h linux-3.13.1-vs2.3.6.10/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.13.1/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sparc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sparc/include/uapi/asm/unistd.h linux-3.13.6-vs2.3.6.11/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.13.6/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sparc/include/uapi/asm/unistd.h 2014-01-31 20:38:03.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -639,9 +639,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sparc/include/uapi/asm/unistd.h linux-3.
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.13.1/arch/sparc/kernel/systbls_32.S linux-3.13.1-vs2.3.6.10/arch/sparc/kernel/systbls_32.S
---- linux-3.13.1/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sparc/kernel/systbls_32.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sparc/kernel/systbls_32.S linux-3.13.6-vs2.3.6.11/arch/sparc/kernel/systbls_32.S
+--- linux-3.13.6/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sparc/kernel/systbls_32.S 2014-01-31 20:38:03.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
@@ -651,9 +651,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sparc/kernel/systbls_32.S linux-3.13.1-v
/*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.13.1/arch/sparc/kernel/systbls_64.S linux-3.13.1-vs2.3.6.10/arch/sparc/kernel/systbls_64.S
---- linux-3.13.1/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/sparc/kernel/systbls_64.S 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/sparc/kernel/systbls_64.S linux-3.13.6-vs2.3.6.11/arch/sparc/kernel/systbls_64.S
+--- linux-3.13.6/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/sparc/kernel/systbls_64.S 2014-01-31 20:38:03.000000000 +0000
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys_mremap, compat_sys_sysctl, sys_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
@@ -672,9 +672,9 @@ diff -NurpP --minimal linux-3.13.1/arch/sparc/kernel/systbls_64.S linux-3.13.1-v
/*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.13.1/arch/um/Kconfig.rest linux-3.13.1-vs2.3.6.10/arch/um/Kconfig.rest
---- linux-3.13.1/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/um/Kconfig.rest 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/um/Kconfig.rest linux-3.13.6-vs2.3.6.11/arch/um/Kconfig.rest
+--- linux-3.13.6/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/um/Kconfig.rest 2014-01-31 20:38:03.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -684,9 +684,9 @@ diff -NurpP --minimal linux-3.13.1/arch/um/Kconfig.rest linux-3.13.1-vs2.3.6.10/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/x86/Kconfig linux-3.13.1-vs2.3.6.10/arch/x86/Kconfig
---- linux-3.13.1/arch/x86/Kconfig 2014-01-22 20:38:25.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/x86/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/x86/Kconfig linux-3.13.6-vs2.3.6.11/arch/x86/Kconfig
+--- linux-3.13.6/arch/x86/Kconfig 2014-01-22 20:38:25.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/x86/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -2403,6 +2403,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -696,9 +696,9 @@ diff -NurpP --minimal linux-3.13.1/arch/x86/Kconfig linux-3.13.1-vs2.3.6.10/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.13.1/arch/x86/syscalls/syscall_32.tbl linux-3.13.1-vs2.3.6.10/arch/x86/syscalls/syscall_32.tbl
---- linux-3.13.1/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/x86/syscalls/syscall_32.tbl 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/x86/syscalls/syscall_32.tbl linux-3.13.6-vs2.3.6.11/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.13.6/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/x86/syscalls/syscall_32.tbl 2014-01-31 20:38:03.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -708,9 +708,9 @@ diff -NurpP --minimal linux-3.13.1/arch/x86/syscalls/syscall_32.tbl linux-3.13.1
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.13.1/arch/x86/syscalls/syscall_64.tbl linux-3.13.1-vs2.3.6.10/arch/x86/syscalls/syscall_64.tbl
---- linux-3.13.1/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/arch/x86/syscalls/syscall_64.tbl 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/arch/x86/syscalls/syscall_64.tbl linux-3.13.6-vs2.3.6.11/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.13.6/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/arch/x86/syscalls/syscall_64.tbl 2014-01-31 20:38:03.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -720,9 +720,9 @@ diff -NurpP --minimal linux-3.13.1/arch/x86/syscalls/syscall_64.tbl linux-3.13.1
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.13.1/drivers/block/Kconfig linux-3.13.1-vs2.3.6.10/drivers/block/Kconfig
---- linux-3.13.1/drivers/block/Kconfig 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/block/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/block/Kconfig linux-3.13.6-vs2.3.6.11/drivers/block/Kconfig
+--- linux-3.13.6/drivers/block/Kconfig 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/block/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -281,6 +281,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -737,9 +737,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/block/Kconfig linux-3.13.1-vs2.3.6.10
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.13.1/drivers/block/Makefile linux-3.13.1-vs2.3.6.10/drivers/block/Makefile
---- linux-3.13.1/drivers/block/Makefile 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/block/Makefile 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/block/Makefile linux-3.13.6-vs2.3.6.11/drivers/block/Makefile
+--- linux-3.13.6/drivers/block/Makefile 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/block/Makefile 2014-01-31 20:38:03.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
@@ -748,9 +748,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/block/Makefile linux-3.13.1-vs2.3.6.1
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.13.1/drivers/block/loop.c linux-3.13.1-vs2.3.6.10/drivers/block/loop.c
---- linux-3.13.1/drivers/block/loop.c 2014-01-22 20:38:27.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/block/loop.c 2014-01-31 20:55:14.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/block/loop.c linux-3.13.6-vs2.3.6.11/drivers/block/loop.c
+--- linux-3.13.6/drivers/block/loop.c 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/block/loop.c 2014-01-31 20:55:14.000000000 +0000
@@ -75,6 +75,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -806,9 +806,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/block/loop.c linux-3.13.1-vs2.3.6.10/
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.13.1/drivers/block/loop.h linux-3.13.1-vs2.3.6.10/drivers/block/loop.h
---- linux-3.13.1/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/block/loop.h 2014-02-01 01:57:49.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/block/loop.h linux-3.13.6-vs2.3.6.11/drivers/block/loop.h
+--- linux-3.13.6/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/block/loop.h 2014-02-01 01:57:49.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -817,9 +817,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/block/loop.h linux-3.13.1-vs2.3.6.10/
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.13.1/drivers/block/vroot.c linux-3.13.1-vs2.3.6.10/drivers/block/vroot.c
---- linux-3.13.1/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/block/vroot.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/block/vroot.c linux-3.13.6-vs2.3.6.11/drivers/block/vroot.c
+--- linux-3.13.6/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/block/vroot.c 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1111,9 +1111,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/block/vroot.c linux-3.13.1-vs2.3.6.10
+
+#endif
+
-diff -NurpP --minimal linux-3.13.1/drivers/infiniband/Kconfig linux-3.13.1-vs2.3.6.10/drivers/infiniband/Kconfig
---- linux-3.13.1/drivers/infiniband/Kconfig 2014-01-22 20:38:35.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/infiniband/Kconfig 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/infiniband/Kconfig linux-3.13.6-vs2.3.6.11/drivers/infiniband/Kconfig
+--- linux-3.13.6/drivers/infiniband/Kconfig 2014-01-22 20:38:35.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/infiniband/Kconfig 2014-01-31 20:38:03.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1123,9 +1123,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/infiniband/Kconfig linux-3.13.1-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.13.1/drivers/infiniband/core/addr.c linux-3.13.1-vs2.3.6.10/drivers/infiniband/core/addr.c
---- linux-3.13.1/drivers/infiniband/core/addr.c 2013-11-25 15:44:35.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/infiniband/core/addr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/infiniband/core/addr.c linux-3.13.6-vs2.3.6.11/drivers/infiniband/core/addr.c
+--- linux-3.13.6/drivers/infiniband/core/addr.c 2013-11-25 15:44:35.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/infiniband/core/addr.c 2014-01-31 20:38:03.000000000 +0000
@@ -277,7 +277,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1135,9 +1135,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/infiniband/core/addr.c linux-3.13.1-v
if (ret)
goto put;
-diff -NurpP --minimal linux-3.13.1/drivers/md/dm-ioctl.c linux-3.13.1-vs2.3.6.10/drivers/md/dm-ioctl.c
---- linux-3.13.1/drivers/md/dm-ioctl.c 2014-01-22 20:38:36.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/md/dm-ioctl.c 2014-01-31 21:01:49.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/md/dm-ioctl.c linux-3.13.6-vs2.3.6.11/drivers/md/dm-ioctl.c
+--- linux-3.13.6/drivers/md/dm-ioctl.c 2014-01-22 20:38:36.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/md/dm-ioctl.c 2014-01-31 21:01:49.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1223,9 +1223,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/md/dm-ioctl.c linux-3.13.1-vs2.3.6.10
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.13.1/drivers/md/dm.c linux-3.13.1-vs2.3.6.10/drivers/md/dm.c
---- linux-3.13.1/drivers/md/dm.c 2014-01-22 20:38:36.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/md/dm.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/md/dm.c linux-3.13.6-vs2.3.6.11/drivers/md/dm.c
+--- linux-3.13.6/drivers/md/dm.c 2014-03-12 13:51:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/md/dm.c 2014-02-25 11:26:09.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1299,10 +1299,10 @@ diff -NurpP --minimal linux-3.13.1/drivers/md/dm.c linux-3.13.1-vs2.3.6.10/drive
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.13.1/drivers/md/dm.h linux-3.13.1-vs2.3.6.10/drivers/md/dm.h
---- linux-3.13.1/drivers/md/dm.h 2014-01-22 20:38:36.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/md/dm.h 2014-01-31 20:38:03.000000000 +0000
-@@ -48,6 +48,8 @@ struct dm_dev_internal {
+diff -NurpP --minimal linux-3.13.6/drivers/md/dm.h linux-3.13.6-vs2.3.6.11/drivers/md/dm.h
+--- linux-3.13.6/drivers/md/dm.h 2014-03-12 13:51:16.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/md/dm.h 2014-02-25 11:26:09.000000000 +0000
+@@ -50,6 +50,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1311,9 +1311,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/md/dm.h linux-3.13.1-vs2.3.6.10/drive
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.13.1/drivers/net/tun.c linux-3.13.1-vs2.3.6.10/drivers/net/tun.c
---- linux-3.13.1/drivers/net/tun.c 2014-01-22 20:38:45.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/net/tun.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/net/tun.c linux-3.13.6-vs2.3.6.11/drivers/net/tun.c
+--- linux-3.13.6/drivers/net/tun.c 2014-01-22 20:38:45.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/net/tun.c 2014-01-31 20:38:03.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1372,9 +1372,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/net/tun.c linux-3.13.1-vs2.3.6.10/dri
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.13.1/drivers/tty/sysrq.c linux-3.13.1-vs2.3.6.10/drivers/tty/sysrq.c
---- linux-3.13.1/drivers/tty/sysrq.c 2014-01-22 20:39:02.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/tty/sysrq.c 2014-01-31 20:55:49.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/tty/sysrq.c linux-3.13.6-vs2.3.6.11/drivers/tty/sysrq.c
+--- linux-3.13.6/drivers/tty/sysrq.c 2014-01-22 20:39:02.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/tty/sysrq.c 2014-01-31 20:55:49.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/jiffies.h>
#include <linux/syscalls.h>
@@ -1426,9 +1426,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/tty/sysrq.c linux-3.13.1-vs2.3.6.10/d
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.13.1/drivers/tty/tty_io.c linux-3.13.1-vs2.3.6.10/drivers/tty/tty_io.c
---- linux-3.13.1/drivers/tty/tty_io.c 2014-01-22 20:39:02.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/drivers/tty/tty_io.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/drivers/tty/tty_io.c linux-3.13.6-vs2.3.6.11/drivers/tty/tty_io.c
+--- linux-3.13.6/drivers/tty/tty_io.c 2014-01-22 20:39:02.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/drivers/tty/tty_io.c 2014-01-31 20:38:03.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1455,9 +1455,9 @@ diff -NurpP --minimal linux-3.13.1/drivers/tty/tty_io.c linux-3.13.1-vs2.3.6.10/
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.13.1/fs/attr.c linux-3.13.1-vs2.3.6.10/fs/attr.c
---- linux-3.13.1/fs/attr.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/attr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/attr.c linux-3.13.6-vs2.3.6.11/fs/attr.c
+--- linux-3.13.6/fs/attr.c 2014-03-12 13:51:19.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/attr.c 2014-03-12 15:51:07.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1498,9 +1498,9 @@ diff -NurpP --minimal linux-3.13.1/fs/attr.c linux-3.13.1-vs2.3.6.10/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.13.1/fs/block_dev.c linux-3.13.1-vs2.3.6.10/fs/block_dev.c
---- linux-3.13.1/fs/block_dev.c 2013-11-25 15:46:58.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/block_dev.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/block_dev.c linux-3.13.6-vs2.3.6.11/fs/block_dev.c
+--- linux-3.13.6/fs/block_dev.c 2013-11-25 15:46:58.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/block_dev.c 2014-01-31 20:38:03.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
@@ -1538,9 +1538,9 @@ diff -NurpP --minimal linux-3.13.1/fs/block_dev.c linux-3.13.1-vs2.3.6.10/fs/blo
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.13.1/fs/btrfs/ctree.h linux-3.13.1-vs2.3.6.10/fs/btrfs/ctree.h
---- linux-3.13.1/fs/btrfs/ctree.h 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/btrfs/ctree.h 2014-01-31 23:58:35.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/btrfs/ctree.h linux-3.13.6-vs2.3.6.11/fs/btrfs/ctree.h
+--- linux-3.13.6/fs/btrfs/ctree.h 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/btrfs/ctree.h 2014-01-31 23:58:35.000000000 +0000
@@ -718,11 +718,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1593,9 +1593,9 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/ctree.h linux-3.13.1-vs2.3.6.10/fs/b
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.13.1/fs/btrfs/disk-io.c linux-3.13.1-vs2.3.6.10/fs/btrfs/disk-io.c
---- linux-3.13.1/fs/btrfs/disk-io.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/btrfs/disk-io.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/btrfs/disk-io.c linux-3.13.6-vs2.3.6.11/fs/btrfs/disk-io.c
+--- linux-3.13.6/fs/btrfs/disk-io.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/btrfs/disk-io.c 2014-01-31 20:38:03.000000000 +0000
@@ -2388,6 +2388,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1606,9 +1606,9 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/disk-io.c linux-3.13.1-vs2.3.6.10/fs
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.13.1/fs/btrfs/inode.c linux-3.13.1-vs2.3.6.10/fs/btrfs/inode.c
---- linux-3.13.1/fs/btrfs/inode.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/btrfs/inode.c 2014-01-31 23:56:42.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/btrfs/inode.c linux-3.13.6-vs2.3.6.11/fs/btrfs/inode.c
+--- linux-3.13.6/fs/btrfs/inode.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/btrfs/inode.c 2014-03-12 15:51:07.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/btrfs.h>
#include <linux/blkdev.h>
@@ -1665,7 +1665,7 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/inode.c linux-3.13.1-vs2.3.6.10/fs/b
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -8648,12 +8665,15 @@ static const struct inode_operations btr
+@@ -8652,12 +8669,15 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
@@ -1681,7 +1681,7 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/inode.c linux-3.13.1-vs2.3.6.10/fs/b
.get_acl = btrfs_get_acl,
.update_time = btrfs_update_time,
};
-@@ -8723,6 +8743,7 @@ static const struct inode_operations btr
+@@ -8727,6 +8747,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
@@ -1689,9 +1689,9 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/inode.c linux-3.13.1-vs2.3.6.10/fs/b
.get_acl = btrfs_get_acl,
.update_time = btrfs_update_time,
};
-diff -NurpP --minimal linux-3.13.1/fs/btrfs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/btrfs/ioctl.c
---- linux-3.13.1/fs/btrfs/ioctl.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/btrfs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/btrfs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/btrfs/ioctl.c
+--- linux-3.13.6/fs/btrfs/ioctl.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/btrfs/ioctl.c 2014-02-25 11:26:09.000000000 +0000
@@ -78,10 +78,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1863,9 +1863,9 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/b
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.13.1/fs/btrfs/super.c linux-3.13.1-vs2.3.6.10/fs/btrfs/super.c
---- linux-3.13.1/fs/btrfs/super.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/btrfs/super.c 2014-01-31 23:58:08.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/btrfs/super.c linux-3.13.6-vs2.3.6.11/fs/btrfs/super.c
+--- linux-3.13.6/fs/btrfs/super.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/btrfs/super.c 2014-01-31 23:58:08.000000000 +0000
@@ -323,7 +323,7 @@ enum {
Opt_check_integrity, Opt_check_integrity_including_extent_data,
Opt_check_integrity_print_mask, Opt_fatal_errors, Opt_rescan_uuid_tree,
@@ -1921,9 +1921,9 @@ diff -NurpP --minimal linux-3.13.1/fs/btrfs/super.c linux-3.13.1-vs2.3.6.10/fs/b
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-3.13.1/fs/char_dev.c linux-3.13.1-vs2.3.6.10/fs/char_dev.c
---- linux-3.13.1/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/char_dev.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/char_dev.c linux-3.13.6-vs2.3.6.11/fs/char_dev.c
+--- linux-3.13.6/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/char_dev.c 2014-01-31 20:38:03.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1956,9 +1956,9 @@ diff -NurpP --minimal linux-3.13.1/fs/char_dev.c linux-3.13.1-vs2.3.6.10/fs/char
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.13.1/fs/dcache.c linux-3.13.1-vs2.3.6.10/fs/dcache.c
---- linux-3.13.1/fs/dcache.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/dcache.c 2014-01-31 23:38:38.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/dcache.c linux-3.13.6-vs2.3.6.11/fs/dcache.c
+--- linux-3.13.6/fs/dcache.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/dcache.c 2014-02-25 11:26:09.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/prefetch.h>
#include <linux/ratelimit.h>
@@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.13.1/fs/dcache.c linux-3.13.1-vs2.3.6.10/fs/dcache
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.13.1/fs/devpts/inode.c linux-3.13.1-vs2.3.6.10/fs/devpts/inode.c
---- linux-3.13.1/fs/devpts/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/devpts/inode.c 2014-02-01 01:40:53.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/devpts/inode.c linux-3.13.6-vs2.3.6.11/fs/devpts/inode.c
+--- linux-3.13.6/fs/devpts/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/devpts/inode.c 2014-02-01 01:40:53.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2100,9 +2100,9 @@ diff -NurpP --minimal linux-3.13.1/fs/devpts/inode.c linux-3.13.1-vs2.3.6.10/fs/
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.13.1/fs/ext2/balloc.c linux-3.13.1-vs2.3.6.10/fs/ext2/balloc.c
---- linux-3.13.1/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/balloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/balloc.c linux-3.13.6-vs2.3.6.11/fs/ext2/balloc.c
+--- linux-3.13.6/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/balloc.c 2014-01-31 20:38:03.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2111,9 +2111,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/balloc.c linux-3.13.1-vs2.3.6.10/fs/e
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.13.1/fs/ext2/ext2.h linux-3.13.1-vs2.3.6.10/fs/ext2/ext2.h
---- linux-3.13.1/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/ext2.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/ext2.h linux-3.13.6-vs2.3.6.11/fs/ext2/ext2.h
+--- linux-3.13.6/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/ext2.h 2014-01-31 20:38:03.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) */
@@ -2161,18 +2161,18 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/ext2.h linux-3.13.1-vs2.3.6.10/fs/ext
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.13.1/fs/ext2/file.c linux-3.13.1-vs2.3.6.10/fs/ext2/file.c
---- linux-3.13.1/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/file.c linux-3.13.6-vs2.3.6.11/fs/ext2/file.c
+--- linux-3.13.6/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/file.c 2014-01-31 20:38:03.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.13.1/fs/ext2/ialloc.c linux-3.13.1-vs2.3.6.10/fs/ext2/ialloc.c
---- linux-3.13.1/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/ialloc.c linux-3.13.6-vs2.3.6.11/fs/ext2/ialloc.c
+--- linux-3.13.6/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/ialloc.c 2014-01-31 20:38:03.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2189,9 +2189,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/ialloc.c linux-3.13.1-vs2.3.6.10/fs/e
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.13.1/fs/ext2/inode.c linux-3.13.1-vs2.3.6.10/fs/ext2/inode.c
---- linux-3.13.1/fs/ext2/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/inode.c linux-3.13.6-vs2.3.6.11/fs/ext2/inode.c
+--- linux-3.13.6/fs/ext2/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/inode.c 2014-01-31 20:38:03.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
@@ -2324,9 +2324,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/inode.c linux-3.13.1-vs2.3.6.10/fs/ex
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.13.1/fs/ext2/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ext2/ioctl.c
---- linux-3.13.1/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ext2/ioctl.c
+--- linux-3.13.6/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2376,9 +2376,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.13.1/fs/ext2/namei.c linux-3.13.1-vs2.3.6.10/fs/ext2/namei.c
---- linux-3.13.1/fs/ext2/namei.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/namei.c linux-3.13.6-vs2.3.6.11/fs/ext2/namei.c
+--- linux-3.13.6/fs/ext2/namei.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/namei.c 2014-01-31 20:38:03.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2402,9 +2402,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/namei.c linux-3.13.1-vs2.3.6.10/fs/ex
+ .sync_flags = ext2_sync_flags,
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.13.1/fs/ext2/super.c linux-3.13.1-vs2.3.6.10/fs/ext2/super.c
---- linux-3.13.1/fs/ext2/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext2/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext2/super.c linux-3.13.6-vs2.3.6.11/fs/ext2/super.c
+--- linux-3.13.6/fs/ext2/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext2/super.c 2014-01-31 20:38:03.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,
@@ -2470,9 +2470,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext2/super.c linux-3.13.1-vs2.3.6.10/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.1/fs/ext3/ext3.h linux-3.13.1-vs2.3.6.10/fs/ext3/ext3.h
---- linux-3.13.1/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/ext3.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/ext3.h linux-3.13.6-vs2.3.6.11/fs/ext3/ext3.h
+--- linux-3.13.6/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/ext3.h 2014-01-31 20:38:03.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) */
@@ -2524,9 +2524,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/ext3.h linux-3.13.1-vs2.3.6.10/fs/ext
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.13.1/fs/ext3/file.c linux-3.13.1-vs2.3.6.10/fs/ext3/file.c
---- linux-3.13.1/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/file.c linux-3.13.6-vs2.3.6.11/fs/ext3/file.c
+--- linux-3.13.6/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/file.c 2014-01-31 20:38:03.000000000 +0000
@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
@@ -2534,9 +2534,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/file.c linux-3.13.1-vs2.3.6.10/fs/ext
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.13.1/fs/ext3/ialloc.c linux-3.13.1-vs2.3.6.10/fs/ext3/ialloc.c
---- linux-3.13.1/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/ialloc.c linux-3.13.6-vs2.3.6.11/fs/ext3/ialloc.c
+--- linux-3.13.6/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/ialloc.c 2014-01-31 20:38:03.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2553,9 +2553,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/ialloc.c linux-3.13.1-vs2.3.6.10/fs/e
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.13.1/fs/ext3/inode.c linux-3.13.1-vs2.3.6.10/fs/ext3/inode.c
---- linux-3.13.1/fs/ext3/inode.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/inode.c linux-3.13.6-vs2.3.6.11/fs/ext3/inode.c
+--- linux-3.13.6/fs/ext3/inode.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/inode.c 2014-01-31 20:38:03.000000000 +0000
@@ -28,6 +28,8 @@
#include <linux/mpage.h>
#include <linux/namei.h>
@@ -2688,9 +2688,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/inode.c linux-3.13.1-vs2.3.6.10/fs/ex
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.13.1/fs/ext3/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ext3/ioctl.c
---- linux-3.13.1/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ext3/ioctl.c
+--- linux-3.13.6/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/ioctl.c 2014-01-31 20:38:03.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2758,9 +2758,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.13.1/fs/ext3/namei.c linux-3.13.1-vs2.3.6.10/fs/ext3/namei.c
---- linux-3.13.1/fs/ext3/namei.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/namei.c linux-3.13.6-vs2.3.6.11/fs/ext3/namei.c
+--- linux-3.13.6/fs/ext3/namei.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/namei.c 2014-01-31 20:38:03.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2786,9 +2786,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/namei.c linux-3.13.1-vs2.3.6.10/fs/ex
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.13.1/fs/ext3/super.c linux-3.13.1-vs2.3.6.10/fs/ext3/super.c
---- linux-3.13.1/fs/ext3/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext3/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext3/super.c linux-3.13.6-vs2.3.6.11/fs/ext3/super.c
+--- linux-3.13.6/fs/ext3/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext3/super.c 2014-01-31 20:38:03.000000000 +0000
@@ -826,7 +826,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2855,9 +2855,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext3/super.c linux-3.13.1-vs2.3.6.10/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.1/fs/ext4/ext4.h linux-3.13.1-vs2.3.6.10/fs/ext4/ext4.h
---- linux-3.13.1/fs/ext4/ext4.h 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/ext4.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/ext4.h linux-3.13.6-vs2.3.6.11/fs/ext4/ext4.h
+--- linux-3.13.6/fs/ext4/ext4.h 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/ext4.h 2014-03-12 15:51:07.000000000 +0000
@@ -385,7 +385,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2878,7 +2878,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ext4.h linux-3.13.1-vs2.3.6.10/fs/ext
} linux2;
struct {
__le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-@@ -788,6 +791,7 @@ do { \
+@@ -790,6 +793,7 @@ do { \
#define i_gid_low i_gid
#define i_uid_high osd2.linux2.l_i_uid_high
#define i_gid_high osd2.linux2.l_i_gid_high
@@ -2886,7 +2886,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ext4.h linux-3.13.1-vs2.3.6.10/fs/ext
#define i_checksum_lo osd2.linux2.l_i_checksum_lo
#elif defined(__GNU__)
-@@ -974,6 +978,7 @@ struct ext4_inode_info {
+@@ -976,6 +980,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
@@ -2894,7 +2894,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ext4.h linux-3.13.1-vs2.3.6.10/fs/ext
#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
-@@ -2651,6 +2656,7 @@ extern struct buffer_head *ext4_get_firs
+@@ -2653,6 +2658,7 @@ extern struct buffer_head *ext4_get_firs
extern int ext4_inline_data_fiemap(struct inode *inode,
struct fiemap_extent_info *fieinfo,
int *has_inline);
@@ -2902,9 +2902,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ext4.h linux-3.13.1-vs2.3.6.10/fs/ext
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
-diff -NurpP --minimal linux-3.13.1/fs/ext4/file.c linux-3.13.1-vs2.3.6.10/fs/ext4/file.c
---- linux-3.13.1/fs/ext4/file.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/file.c linux-3.13.6-vs2.3.6.11/fs/ext4/file.c
+--- linux-3.13.6/fs/ext4/file.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/file.c 2014-01-31 20:38:03.000000000 +0000
@@ -618,5 +618,6 @@ const struct inode_operations ext4_file_
.removexattr = generic_removexattr,
.get_acl = ext4_get_acl,
@@ -2912,9 +2912,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/file.c linux-3.13.1-vs2.3.6.10/fs/ext
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.13.1/fs/ext4/ialloc.c linux-3.13.1-vs2.3.6.10/fs/ext4/ialloc.c
---- linux-3.13.1/fs/ext4/ialloc.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/ialloc.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/ialloc.c linux-3.13.6-vs2.3.6.11/fs/ext4/ialloc.c
+--- linux-3.13.6/fs/ext4/ialloc.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/ialloc.c 2014-01-31 20:38:03.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2931,9 +2931,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ialloc.c linux-3.13.1-vs2.3.6.10/fs/e
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-3.13.1/fs/ext4/inode.c linux-3.13.1-vs2.3.6.10/fs/ext4/inode.c
---- linux-3.13.1/fs/ext4/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ext4/inode.c
+--- linux-3.13.6/fs/ext4/inode.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/inode.c 2014-03-12 15:51:07.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -3069,9 +3069,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/inode.c linux-3.13.1-vs2.3.6.10/fs/ex
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.13.1/fs/ext4/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ext4/ioctl.c
---- linux-3.13.1/fs/ext4/ioctl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ext4/ioctl.c
+--- linux-3.13.6/fs/ext4/ioctl.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/ioctl.c 2014-03-12 15:51:07.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3080,7 +3080,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
#include <asm/uaccess.h>
#include "ext4_jbd2.h"
#include "ext4.h"
-@@ -213,6 +214,33 @@ swap_boot_out:
+@@ -214,6 +215,33 @@ swap_boot_out:
return err;
}
@@ -3114,7 +3114,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-@@ -246,6 +274,11 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -247,6 +275,11 @@ long ext4_ioctl(struct file *filp, unsig
flags = ext4_mask_flags(inode->i_mode, flags);
@@ -3126,7 +3126,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
err = -EPERM;
mutex_lock(&inode->i_mutex);
/* Is it quota file? Do not allow user to mess with it */
-@@ -263,7 +296,9 @@ long ext4_ioctl(struct file *filp, unsig
+@@ -264,7 +297,9 @@ long ext4_ioctl(struct file *filp, unsig
*
* This test looks nicer. Thanks to Pauline Middelink
*/
@@ -3137,9 +3137,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ex
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.13.1/fs/ext4/namei.c linux-3.13.1-vs2.3.6.10/fs/ext4/namei.c
---- linux-3.13.1/fs/ext4/namei.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/namei.c linux-3.13.6-vs2.3.6.11/fs/ext4/namei.c
+--- linux-3.13.6/fs/ext4/namei.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/namei.c 2014-01-31 20:38:03.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3164,9 +3164,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/namei.c linux-3.13.1-vs2.3.6.10/fs/ex
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.13.1/fs/ext4/super.c linux-3.13.1-vs2.3.6.10/fs/ext4/super.c
---- linux-3.13.1/fs/ext4/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ext4/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ext4/super.c linux-3.13.6-vs2.3.6.11/fs/ext4/super.c
+--- linux-3.13.6/fs/ext4/super.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ext4/super.c 2014-03-12 15:51:07.000000000 +0000
@@ -1162,7 +1162,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3217,7 +3217,7 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/super.c linux-3.13.1-vs2.3.6.10/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4812,6 +4832,14 @@ static int ext4_remount(struct super_blo
+@@ -4818,6 +4838,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
@@ -3232,9 +3232,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ext4/super.c linux-3.13.1-vs2.3.6.10/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.13.1/fs/fcntl.c linux-3.13.1-vs2.3.6.10/fs/fcntl.c
---- linux-3.13.1/fs/fcntl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/fcntl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/fcntl.c linux-3.13.6-vs2.3.6.11/fs/fcntl.c
+--- linux-3.13.6/fs/fcntl.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/fcntl.c 2014-01-31 20:38:03.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
@@ -3252,9 +3252,9 @@ diff -NurpP --minimal linux-3.13.1/fs/fcntl.c linux-3.13.1-vs2.3.6.10/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.13.1/fs/file.c linux-3.13.1-vs2.3.6.10/fs/file.c
---- linux-3.13.1/fs/file.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/file.c linux-3.13.6-vs2.3.6.11/fs/file.c
+--- linux-3.13.6/fs/file.c 2014-03-12 13:51:20.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/file.c 2014-02-25 11:26:09.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3309,9 +3309,9 @@ diff -NurpP --minimal linux-3.13.1/fs/file.c linux-3.13.1-vs2.3.6.10/fs/file.c
return fd;
-diff -NurpP --minimal linux-3.13.1/fs/file_table.c linux-3.13.1-vs2.3.6.10/fs/file_table.c
---- linux-3.13.1/fs/file_table.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/file_table.c 2014-02-01 00:00:01.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/file_table.c linux-3.13.6-vs2.3.6.11/fs/file_table.c
+--- linux-3.13.6/fs/file_table.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/file_table.c 2014-02-01 00:00:01.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3348,9 +3348,9 @@ diff -NurpP --minimal linux-3.13.1/fs/file_table.c linux-3.13.1-vs2.3.6.10/fs/fi
file_free(file);
}
}
-diff -NurpP --minimal linux-3.13.1/fs/fs_struct.c linux-3.13.1-vs2.3.6.10/fs/fs_struct.c
---- linux-3.13.1/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/fs_struct.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/fs_struct.c linux-3.13.6-vs2.3.6.11/fs/fs_struct.c
+--- linux-3.13.6/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/fs_struct.c 2014-01-31 20:38:03.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3375,9 +3375,9 @@ diff -NurpP --minimal linux-3.13.1/fs/fs_struct.c linux-3.13.1-vs2.3.6.10/fs/fs_
}
return fs;
}
-diff -NurpP --minimal linux-3.13.1/fs/gfs2/file.c linux-3.13.1-vs2.3.6.10/fs/gfs2/file.c
---- linux-3.13.1/fs/gfs2/file.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/gfs2/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/gfs2/file.c linux-3.13.6-vs2.3.6.11/fs/gfs2/file.c
+--- linux-3.13.6/fs/gfs2/file.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/gfs2/file.c 2014-01-31 20:38:03.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3500,9 +3500,9 @@ diff -NurpP --minimal linux-3.13.1/fs/gfs2/file.c linux-3.13.1-vs2.3.6.10/fs/gfs
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.13.1/fs/gfs2/inode.h linux-3.13.1-vs2.3.6.10/fs/gfs2/inode.h
---- linux-3.13.1/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/gfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/gfs2/inode.h linux-3.13.6-vs2.3.6.11/fs/gfs2/inode.h
+--- linux-3.13.6/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/gfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3511,9 +3511,9 @@ diff -NurpP --minimal linux-3.13.1/fs/gfs2/inode.h linux-3.13.1-vs2.3.6.10/fs/gf
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.13.1/fs/hostfs/hostfs.h linux-3.13.1-vs2.3.6.10/fs/hostfs/hostfs.h
---- linux-3.13.1/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/hostfs/hostfs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/hostfs/hostfs.h linux-3.13.6-vs2.3.6.11/fs/hostfs/hostfs.h
+--- linux-3.13.6/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/hostfs/hostfs.h 2014-01-31 20:38:03.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3522,9 +3522,9 @@ diff -NurpP --minimal linux-3.13.1/fs/hostfs/hostfs.h linux-3.13.1-vs2.3.6.10/fs
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.13.1/fs/inode.c linux-3.13.1-vs2.3.6.10/fs/inode.c
---- linux-3.13.1/fs/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/inode.c 2014-01-31 23:33:47.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/inode.c linux-3.13.6-vs2.3.6.11/fs/inode.c
+--- linux-3.13.6/fs/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/inode.c 2014-01-31 23:33:47.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
@@ -3587,9 +3587,9 @@ diff -NurpP --minimal linux-3.13.1/fs/inode.c linux-3.13.1-vs2.3.6.10/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.13.1/fs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ioctl.c
---- linux-3.13.1/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ioctl.c
+--- linux-3.13.6/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3600,9 +3600,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ioctl.c
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.13.1/fs/ioprio.c linux-3.13.1-vs2.3.6.10/fs/ioprio.c
---- linux-3.13.1/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ioprio.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ioprio.c linux-3.13.6-vs2.3.6.11/fs/ioprio.c
+--- linux-3.13.6/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ioprio.c 2014-01-31 20:38:03.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3629,9 +3629,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ioprio.c linux-3.13.1-vs2.3.6.10/fs/ioprio
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.13.1/fs/jfs/file.c linux-3.13.1-vs2.3.6.10/fs/jfs/file.c
---- linux-3.13.1/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/file.c linux-3.13.6-vs2.3.6.11/fs/jfs/file.c
+--- linux-3.13.6/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/file.c 2014-01-31 20:38:03.000000000 +0000
@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3650,9 +3650,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/file.c linux-3.13.1-vs2.3.6.10/fs/jfs/
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.13.1/fs/jfs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/jfs/ioctl.c
---- linux-3.13.1/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/jfs/ioctl.c
+--- linux-3.13.6/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/ioctl.c 2014-01-31 20:38:03.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3710,9 +3710,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/ioctl.c linux-3.13.1-vs2.3.6.10/fs/jfs
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_dinode.h linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_dinode.h
---- linux-3.13.1/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_dinode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_dinode.h linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_dinode.h
+--- linux-3.13.6/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_dinode.h 2014-01-31 20:38:03.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3729,9 +3729,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_dinode.h linux-3.13.1-vs2.3.6.10/f
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_filsys.h linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_filsys.h
---- linux-3.13.1/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_filsys.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_filsys.h linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_filsys.h
+--- linux-3.13.6/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_filsys.h 2014-01-31 20:38:03.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3740,9 +3740,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_filsys.h linux-3.13.1-vs2.3.6.10/f
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_imap.c linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_imap.c
---- linux-3.13.1/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_imap.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_imap.c linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_imap.c
+--- linux-3.13.6/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_imap.c 2014-01-31 20:38:03.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3806,9 +3806,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_imap.c linux-3.13.1-vs2.3.6.10/fs/
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_inode.c linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_inode.c
---- linux-3.13.1/fs/jfs/jfs_inode.c 2013-11-25 15:46:59.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_inode.c linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_inode.c
+--- linux-3.13.6/fs/jfs/jfs_inode.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_inode.c 2014-01-31 20:38:03.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3882,9 +3882,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_inode.c linux-3.13.1-vs2.3.6.10/fs
}
/*
-diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_inode.h linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_inode.h
---- linux-3.13.1/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/jfs_inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_inode.h linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_inode.h
+--- linux-3.13.6/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/jfs_inode.h 2014-01-31 20:38:03.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);
@@ -3893,9 +3893,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/jfs_inode.h linux-3.13.1-vs2.3.6.10/fs
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.13.1/fs/jfs/namei.c linux-3.13.1-vs2.3.6.10/fs/jfs/namei.c
---- linux-3.13.1/fs/jfs/namei.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/namei.c linux-3.13.6-vs2.3.6.11/fs/jfs/namei.c
+--- linux-3.13.6/fs/jfs/namei.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/namei.c 2014-01-31 20:38:03.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3920,9 +3920,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/namei.c linux-3.13.1-vs2.3.6.10/fs/jfs
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.13.1/fs/jfs/super.c linux-3.13.1-vs2.3.6.10/fs/jfs/super.c
---- linux-3.13.1/fs/jfs/super.c 2013-11-25 15:45:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/jfs/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/jfs/super.c linux-3.13.6-vs2.3.6.11/fs/jfs/super.c
+--- linux-3.13.6/fs/jfs/super.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/jfs/super.c 2014-01-31 20:38:03.000000000 +0000
@@ -203,7 +203,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -3989,9 +3989,9 @@ diff -NurpP --minimal linux-3.13.1/fs/jfs/super.c linux-3.13.1-vs2.3.6.10/fs/jfs
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.13.1/fs/libfs.c linux-3.13.1-vs2.3.6.10/fs/libfs.c
---- linux-3.13.1/fs/libfs.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/libfs.c 2014-02-01 01:35:46.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/libfs.c linux-3.13.6-vs2.3.6.11/fs/libfs.c
+--- linux-3.13.6/fs/libfs.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/libfs.c 2014-02-01 01:35:46.000000000 +0000
@@ -145,13 +145,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4043,9 +4043,9 @@ diff -NurpP --minimal linux-3.13.1/fs/libfs.c linux-3.13.1-vs2.3.6.10/fs/libfs.c
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-3.13.1/fs/locks.c linux-3.13.1-vs2.3.6.10/fs/locks.c
---- linux-3.13.1/fs/locks.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/locks.c 2014-01-31 23:51:55.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/locks.c linux-3.13.6-vs2.3.6.11/fs/locks.c
+--- linux-3.13.6/fs/locks.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/locks.c 2014-01-31 23:51:55.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
@@ -4244,9 +4244,9 @@ diff -NurpP --minimal linux-3.13.1/fs/locks.c linux-3.13.1-vs2.3.6.10/fs/locks.c
return 0;
}
-diff -NurpP --minimal linux-3.13.1/fs/mount.h linux-3.13.1-vs2.3.6.10/fs/mount.h
---- linux-3.13.1/fs/mount.h 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/mount.h 2014-01-31 23:34:30.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/mount.h linux-3.13.6-vs2.3.6.11/fs/mount.h
+--- linux-3.13.6/fs/mount.h 2014-03-12 13:51:21.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/mount.h 2014-02-25 11:26:09.000000000 +0000
@@ -57,6 +57,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
@@ -4255,9 +4255,9 @@ diff -NurpP --minimal linux-3.13.1/fs/mount.h linux-3.13.1-vs2.3.6.10/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.13.1/fs/namei.c linux-3.13.1-vs2.3.6.10/fs/namei.c
---- linux-3.13.1/fs/namei.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/namei.c 2014-02-01 01:26:19.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
+--- linux-3.13.6/fs/namei.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/namei.c 2014-02-01 01:26:19.000000000 +0000
@@ -34,9 +34,19 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4822,9 +4822,9 @@ diff -NurpP --minimal linux-3.13.1/fs/namei.c linux-3.13.1-vs2.3.6.10/fs/namei.c
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.13.1/fs/namespace.c linux-3.13.1-vs2.3.6.10/fs/namespace.c
---- linux-3.13.1/fs/namespace.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/namespace.c 2014-01-31 23:44:28.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/namespace.c
+--- linux-3.13.6/fs/namespace.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/namespace.c 2014-01-31 23:44:28.000000000 +0000
@@ -23,6 +23,11 @@
#include <linux/uaccess.h>
#include <linux/proc_ns.h>
@@ -4969,9 +4969,9 @@ diff -NurpP --minimal linux-3.13.1/fs/namespace.c linux-3.13.1-vs2.3.6.10/fs/nam
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-3.13.1/fs/nfs/client.c linux-3.13.1-vs2.3.6.10/fs/nfs/client.c
---- linux-3.13.1/fs/nfs/client.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfs/client.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfs/client.c linux-3.13.6-vs2.3.6.11/fs/nfs/client.c
+--- linux-3.13.6/fs/nfs/client.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfs/client.c 2014-01-31 20:38:03.000000000 +0000
@@ -685,6 +685,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -4993,9 +4993,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/client.c linux-3.13.1-vs2.3.6.10/fs/nf
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.13.1/fs/nfs/dir.c linux-3.13.1-vs2.3.6.10/fs/nfs/dir.c
---- linux-3.13.1/fs/nfs/dir.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfs/dir.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfs/dir.c linux-3.13.6-vs2.3.6.11/fs/nfs/dir.c
+--- linux-3.13.6/fs/nfs/dir.c 2014-03-12 13:51:21.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfs/dir.c 2014-02-25 11:26:10.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5012,9 +5012,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/dir.c linux-3.13.1-vs2.3.6.10/fs/nfs/d
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs/inode.c
---- linux-3.13.1/fs/nfs/inode.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfs/inode.c 2014-01-31 22:44:31.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfs/inode.c linux-3.13.6-vs2.3.6.11/fs/nfs/inode.c
+--- linux-3.13.6/fs/nfs/inode.c 2014-03-12 13:51:21.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfs/inode.c 2014-03-12 15:51:07.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
@@ -5023,7 +5023,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
#include <asm/uaccess.h>
-@@ -352,6 +353,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -359,6 +360,8 @@ nfs_fhget(struct super_block *sb, struct
if (inode->i_state & I_NEW) {
struct nfs_inode *nfsi = NFS_I(inode);
unsigned long now = jiffies;
@@ -5032,7 +5032,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
/* We set i_ino for the few things that still rely on it,
* such as stat(2) */
-@@ -396,8 +399,8 @@ nfs_fhget(struct super_block *sb, struct
+@@ -403,8 +406,8 @@ nfs_fhget(struct super_block *sb, struct
inode->i_version = 0;
inode->i_size = 0;
clear_nlink(inode);
@@ -5043,7 +5043,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
inode->i_blocks = 0;
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
nfsi->write_io = 0;
-@@ -431,11 +434,11 @@ nfs_fhget(struct super_block *sb, struct
+@@ -438,11 +441,11 @@ nfs_fhget(struct super_block *sb, struct
else if (nfs_server_capable(inode, NFS_CAP_NLINK))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_OWNER)
@@ -5057,7 +5057,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP))
nfsi->cache_validity |= NFS_INO_INVALID_ATTR;
if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)
-@@ -446,6 +449,10 @@ nfs_fhget(struct super_block *sb, struct
+@@ -453,6 +456,10 @@ nfs_fhget(struct super_block *sb, struct
*/
inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);
}
@@ -5068,7 +5068,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
nfs_setsecurity(inode, fattr, label);
-@@ -571,6 +578,8 @@ void nfs_setattr_update_inode(struct ino
+@@ -578,6 +585,8 @@ void nfs_setattr_update_inode(struct ino
inode->i_uid = attr->ia_uid;
if ((attr->ia_valid & ATTR_GID) != 0)
inode->i_gid = attr->ia_gid;
@@ -5077,7 +5077,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL;
spin_unlock(&inode->i_lock);
}
-@@ -1085,7 +1094,9 @@ static int nfs_check_inode_attributes(st
+@@ -1092,7 +1101,9 @@ static int nfs_check_inode_attributes(st
struct nfs_inode *nfsi = NFS_I(inode);
loff_t cur_size, new_isize;
unsigned long invalid = 0;
@@ -5088,7 +5088,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
if (nfs_have_delegated_attributes(inode))
return 0;
-@@ -1110,13 +1121,18 @@ static int nfs_check_inode_attributes(st
+@@ -1117,13 +1128,18 @@ static int nfs_check_inode_attributes(st
invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
}
@@ -5109,7 +5109,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1433,6 +1449,9 @@ static int nfs_update_inode(struct inode
+@@ -1440,6 +1456,9 @@ static int nfs_update_inode(struct inode
unsigned long invalid = 0;
unsigned long now = jiffies;
unsigned long save_cache_validity;
@@ -5119,7 +5119,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1534,6 +1553,9 @@ static int nfs_update_inode(struct inode
+@@ -1541,6 +1560,9 @@ static int nfs_update_inode(struct inode
| NFS_INO_REVAL_PAGECACHE
| NFS_INO_REVAL_FORCED);
@@ -5129,7 +5129,7 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1576,6 +1598,10 @@ static int nfs_update_inode(struct inode
+@@ -1583,6 +1605,10 @@ static int nfs_update_inode(struct inode
| NFS_INO_INVALID_ACL
| NFS_INO_REVAL_FORCED);
@@ -5140,9 +5140,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/inode.c linux-3.13.1-vs2.3.6.10/fs/nfs
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.13.1/fs/nfs/nfs3xdr.c linux-3.13.1-vs2.3.6.10/fs/nfs/nfs3xdr.c
---- linux-3.13.1/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfs/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfs/nfs3xdr.c linux-3.13.6-vs2.3.6.11/fs/nfs/nfs3xdr.c
+--- linux-3.13.6/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfs/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5288,9 +5288,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/nfs3xdr.c linux-3.13.1-vs2.3.6.10/fs/n
}
/*
-diff -NurpP --minimal linux-3.13.1/fs/nfs/super.c linux-3.13.1-vs2.3.6.10/fs/nfs/super.c
---- linux-3.13.1/fs/nfs/super.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfs/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfs/super.c linux-3.13.6-vs2.3.6.11/fs/nfs/super.c
+--- linux-3.13.6/fs/nfs/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfs/super.c 2014-01-31 20:38:03.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5364,9 +5364,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfs/super.c linux-3.13.1-vs2.3.6.10/fs/nfs
/*
* options that take text values
-diff -NurpP --minimal linux-3.13.1/fs/nfsd/auth.c linux-3.13.1-vs2.3.6.10/fs/nfsd/auth.c
---- linux-3.13.1/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfsd/auth.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfsd/auth.c linux-3.13.6-vs2.3.6.11/fs/nfsd/auth.c
+--- linux-3.13.6/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfsd/auth.c 2014-01-31 20:38:03.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5385,9 +5385,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfsd/auth.c linux-3.13.1-vs2.3.6.10/fs/nfs
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfs3xdr.c linux-3.13.1-vs2.3.6.10/fs/nfsd/nfs3xdr.c
---- linux-3.13.1/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfsd/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfs3xdr.c linux-3.13.6-vs2.3.6.11/fs/nfsd/nfs3xdr.c
+--- linux-3.13.6/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfsd/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5441,9 +5441,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfs3xdr.c linux-3.13.1-vs2.3.6.10/fs/
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfs4xdr.c linux-3.13.1-vs2.3.6.10/fs/nfsd/nfs4xdr.c
---- linux-3.13.1/fs/nfsd/nfs4xdr.c 2014-01-22 20:39:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfsd/nfs4xdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfs4xdr.c linux-3.13.6-vs2.3.6.11/fs/nfsd/nfs4xdr.c
+--- linux-3.13.6/fs/nfsd/nfs4xdr.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfsd/nfs4xdr.c 2014-01-31 20:38:03.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5473,9 +5473,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfs4xdr.c linux-3.13.1-vs2.3.6.10/fs/
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfsxdr.c linux-3.13.1-vs2.3.6.10/fs/nfsd/nfsxdr.c
---- linux-3.13.1/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/nfsd/nfsxdr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfsxdr.c linux-3.13.6-vs2.3.6.11/fs/nfsd/nfsxdr.c
+--- linux-3.13.6/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/nfsd/nfsxdr.c 2014-01-31 20:38:03.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5527,9 +5527,9 @@ diff -NurpP --minimal linux-3.13.1/fs/nfsd/nfsxdr.c linux-3.13.1-vs2.3.6.10/fs/n
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/dlmglue.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/dlmglue.c
---- linux-3.13.1/fs/ocfs2/dlmglue.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/dlmglue.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/dlmglue.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/dlmglue.c
+--- linux-3.13.6/fs/ocfs2/dlmglue.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/dlmglue.c 2014-01-31 20:38:03.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(i_uid_read(inode));
@@ -5546,9 +5546,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/dlmglue.c linux-3.13.1-vs2.3.6.10/fs
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.13.1/fs/ocfs2/dlmglue.h linux-3.13.1-vs2.3.6.10/fs/ocfs2/dlmglue.h
---- linux-3.13.1/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/dlmglue.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/dlmglue.h linux-3.13.6-vs2.3.6.11/fs/ocfs2/dlmglue.h
+--- linux-3.13.6/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/dlmglue.h 2014-01-31 20:38:03.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5559,9 +5559,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/dlmglue.h linux-3.13.1-vs2.3.6.10/fs
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/file.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/file.c
---- linux-3.13.1/fs/ocfs2/file.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/file.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/file.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/file.c
+--- linux-3.13.6/fs/ocfs2/file.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/file.c 2014-01-31 20:38:03.000000000 +0000
@@ -1119,7 +1119,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5571,9 +5571,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/file.c linux-3.13.1-vs2.3.6.10/fs/oc
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/inode.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/inode.c
---- linux-3.13.1/fs/ocfs2/inode.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/inode.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/inode.c
+--- linux-3.13.6/fs/ocfs2/inode.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/inode.c 2014-01-31 20:38:03.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5670,9 +5670,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/inode.c linux-3.13.1-vs2.3.6.10/fs/o
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/inode.h linux-3.13.1-vs2.3.6.10/fs/ocfs2/inode.h
---- linux-3.13.1/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/inode.h linux-3.13.6-vs2.3.6.11/fs/ocfs2/inode.h
+--- linux-3.13.6/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/inode.h 2014-01-31 20:38:03.000000000 +0000
@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5681,9 +5681,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/inode.h linux-3.13.1-vs2.3.6.10/fs/o
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/ioctl.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/ioctl.c
---- linux-3.13.1/fs/ocfs2/ioctl.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/ioctl.c
+--- linux-3.13.6/fs/ocfs2/ioctl.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/ioctl.c 2014-01-31 20:38:03.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5747,9 +5747,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/ioctl.c linux-3.13.1-vs2.3.6.10/fs/o
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/namei.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/namei.c
---- linux-3.13.1/fs/ocfs2/namei.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/namei.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/namei.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/namei.c
+--- linux-3.13.6/fs/ocfs2/namei.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/namei.c 2014-01-31 20:38:03.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5782,9 +5782,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/namei.c linux-3.13.1-vs2.3.6.10/fs/o
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.13.1/fs/ocfs2/ocfs2.h linux-3.13.1-vs2.3.6.10/fs/ocfs2/ocfs2.h
---- linux-3.13.1/fs/ocfs2/ocfs2.h 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/ocfs2.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ocfs2.h linux-3.13.6-vs2.3.6.11/fs/ocfs2/ocfs2.h
+--- linux-3.13.6/fs/ocfs2/ocfs2.h 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/ocfs2.h 2014-01-31 20:38:03.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5793,9 +5793,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/ocfs2.h linux-3.13.1-vs2.3.6.10/fs/o
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.13.1/fs/ocfs2/ocfs2_fs.h linux-3.13.1-vs2.3.6.10/fs/ocfs2/ocfs2_fs.h
---- linux-3.13.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/ocfs2_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ocfs2_fs.h linux-3.13.6-vs2.3.6.11/fs/ocfs2/ocfs2_fs.h
+--- linux-3.13.6/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/ocfs2_fs.h 2014-01-31 20:38:03.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 */
@@ -5808,9 +5808,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/ocfs2_fs.h linux-3.13.1-vs2.3.6.10/f
#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.13.1/fs/ocfs2/super.c linux-3.13.1-vs2.3.6.10/fs/ocfs2/super.c
---- linux-3.13.1/fs/ocfs2/super.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/ocfs2/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/ocfs2/super.c linux-3.13.6-vs2.3.6.11/fs/ocfs2/super.c
+--- linux-3.13.6/fs/ocfs2/super.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/ocfs2/super.c 2014-01-31 20:38:03.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -5874,9 +5874,9 @@ diff -NurpP --minimal linux-3.13.1/fs/ocfs2/super.c linux-3.13.1-vs2.3.6.10/fs/o
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.13.1/fs/open.c linux-3.13.1-vs2.3.6.10/fs/open.c
---- linux-3.13.1/fs/open.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/open.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/open.c linux-3.13.6-vs2.3.6.11/fs/open.c
+--- linux-3.13.6/fs/open.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/open.c 2014-01-31 20:38:03.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5952,9 +5952,9 @@ diff -NurpP --minimal linux-3.13.1/fs/open.c linux-3.13.1-vs2.3.6.10/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.13.1/fs/proc/array.c linux-3.13.1-vs2.3.6.10/fs/proc/array.c
---- linux-3.13.1/fs/proc/array.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/array.c 2014-02-01 01:44:54.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/array.c linux-3.13.6-vs2.3.6.11/fs/proc/array.c
+--- linux-3.13.6/fs/proc/array.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/array.c 2014-02-01 01:44:54.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
@@ -6069,9 +6069,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/array.c linux-3.13.1-vs2.3.6.10/fs/pr
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.13.1/fs/proc/base.c linux-3.13.1-vs2.3.6.10/fs/proc/base.c
---- linux-3.13.1/fs/proc/base.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/base.c 2014-02-01 00:05:10.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/proc/base.c
+--- linux-3.13.6/fs/proc/base.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/base.c 2014-02-01 00:05:10.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6208,9 +6208,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/base.c linux-3.13.1-vs2.3.6.10/fs/pro
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.13.1/fs/proc/generic.c linux-3.13.1-vs2.3.6.10/fs/proc/generic.c
---- linux-3.13.1/fs/proc/generic.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/generic.c 2014-02-01 00:07:40.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/generic.c linux-3.13.6-vs2.3.6.11/fs/proc/generic.c
+--- linux-3.13.6/fs/proc/generic.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/generic.c 2014-02-01 00:07:40.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6273,9 +6273,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/generic.c linux-3.13.1-vs2.3.6.10/fs/
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.13.1/fs/proc/inode.c linux-3.13.1-vs2.3.6.10/fs/proc/inode.c
---- linux-3.13.1/fs/proc/inode.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/inode.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/inode.c linux-3.13.6-vs2.3.6.11/fs/proc/inode.c
+--- linux-3.13.6/fs/proc/inode.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/inode.c 2014-01-31 20:38:03.000000000 +0000
@@ -415,6 +415,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6285,9 +6285,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/inode.c linux-3.13.1-vs2.3.6.10/fs/pr
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.13.1/fs/proc/internal.h linux-3.13.1-vs2.3.6.10/fs/proc/internal.h
---- linux-3.13.1/fs/proc/internal.h 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/internal.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/internal.h linux-3.13.6-vs2.3.6.11/fs/proc/internal.h
+--- linux-3.13.6/fs/proc/internal.h 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/internal.h 2014-01-31 20:38:03.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -6355,9 +6355,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/internal.h linux-3.13.1-vs2.3.6.10/fs
/*
* base.c
-diff -NurpP --minimal linux-3.13.1/fs/proc/loadavg.c linux-3.13.1-vs2.3.6.10/fs/proc/loadavg.c
---- linux-3.13.1/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/loadavg.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/loadavg.c linux-3.13.6-vs2.3.6.11/fs/proc/loadavg.c
+--- linux-3.13.6/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/loadavg.c 2014-01-31 20:38:03.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6387,9 +6387,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/loadavg.c linux-3.13.1-vs2.3.6.10/fs/
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.13.1/fs/proc/meminfo.c linux-3.13.1-vs2.3.6.10/fs/proc/meminfo.c
---- linux-3.13.1/fs/proc/meminfo.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/meminfo.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/meminfo.c linux-3.13.6-vs2.3.6.11/fs/proc/meminfo.c
+--- linux-3.13.6/fs/proc/meminfo.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/meminfo.c 2014-01-31 20:38:03.000000000 +0000
@@ -37,7 +37,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
@@ -6400,9 +6400,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/meminfo.c linux-3.13.1-vs2.3.6.10/fs/
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.13.1/fs/proc/root.c linux-3.13.1-vs2.3.6.10/fs/proc/root.c
---- linux-3.13.1/fs/proc/root.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/root.c 2014-02-01 00:02:11.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/root.c linux-3.13.6-vs2.3.6.11/fs/proc/root.c
+--- linux-3.13.6/fs/proc/root.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/root.c 2014-02-01 00:02:11.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6444,9 +6444,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/root.c linux-3.13.1-vs2.3.6.10/fs/pro
.name = "/proc",
};
-diff -NurpP --minimal linux-3.13.1/fs/proc/self.c linux-3.13.1-vs2.3.6.10/fs/proc/self.c
---- linux-3.13.1/fs/proc/self.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/self.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/self.c linux-3.13.6-vs2.3.6.11/fs/proc/self.c
+--- linux-3.13.6/fs/proc/self.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/self.c 2014-01-31 20:38:03.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
@@ -6464,9 +6464,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/self.c linux-3.13.1-vs2.3.6.10/fs/pro
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-3.13.1/fs/proc/stat.c linux-3.13.1-vs2.3.6.10/fs/proc/stat.c
---- linux-3.13.1/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/stat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/stat.c linux-3.13.6-vs2.3.6.11/fs/proc/stat.c
+--- linux-3.13.6/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/stat.c 2014-01-31 20:38:03.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6515,9 +6515,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/stat.c linux-3.13.1-vs2.3.6.10/fs/pro
/* 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.13.1/fs/proc/uptime.c linux-3.13.1-vs2.3.6.10/fs/proc/uptime.c
---- linux-3.13.1/fs/proc/uptime.c 2013-11-25 15:45:04.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc/uptime.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc/uptime.c linux-3.13.6-vs2.3.6.11/fs/proc/uptime.c
+--- linux-3.13.6/fs/proc/uptime.c 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc/uptime.c 2014-01-31 20:38:03.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6537,9 +6537,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc/uptime.c linux-3.13.1-vs2.3.6.10/fs/p
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.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/fs/proc_namespace.c
---- linux-3.13.1/fs/proc_namespace.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/proc_namespace.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/proc_namespace.c linux-3.13.6-vs2.3.6.11/fs/proc_namespace.c
+--- linux-3.13.6/fs/proc_namespace.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/proc_namespace.c 2014-02-25 12:43:16.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
@@ -6549,7 +6549,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
{ 0, NULL }
};
const struct proc_fs_info *fs_infop;
-@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil
+@@ -80,6 +82,38 @@ static inline void mangle(struct seq_fil
seq_escape(m, s, " \t\n\\");
}
@@ -6566,7 +6566,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
+ if (mnt == mnt->mnt_ns->root)
+ return 1;
+
-+ br_read_lock(&vfsmount_lock);
++ rcu_read_lock();
+ root = current->fs->root;
+ root_mnt = real_mount(root.mnt);
+ point = root.dentry;
@@ -6575,11 +6575,9 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
+ point = mnt->mnt_mountpoint;
+ mnt = mnt->mnt_parent;
+ }
++ rcu_read_unlock();
+
+ ret = (mnt == root_mnt) && is_subdir(point, root.dentry);
-+
-+ br_read_unlock(&vfsmount_lock);
-+
+ return ret;
+}
+
@@ -6590,7 +6588,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
static void show_type(struct seq_file *m, struct super_block *sb)
{
mangle(m, sb->s_type->name);
-@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file *
+@@ -96,6 +130,17 @@ static int show_vfsmnt(struct seq_file *
struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };
struct super_block *sb = mnt_path.dentry->d_sb;
@@ -6608,7 +6606,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
if (sb->s_op->show_devname) {
err = sb->s_op->show_devname(m, mnt_path.dentry);
if (err)
-@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file *
+@@ -106,6 +151,7 @@ static int show_vfsmnt(struct seq_file *
seq_putc(m, ' ');
seq_path(m, &mnt_path, " \t\n\\");
seq_putc(m, ' ');
@@ -6616,7 +6614,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
show_type(m, sb);
seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw");
err = show_sb_opts(m, sb);
-@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil
+@@ -128,6 +174,11 @@ static int show_mountinfo(struct seq_fil
struct path root = p->root;
int err = 0;
@@ -6628,7 +6626,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id,
MAJOR(sb->s_dev), MINOR(sb->s_dev));
if (sb->s_op->show_path)
-@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file
+@@ -187,6 +238,17 @@ static int show_vfsstat(struct seq_file
struct super_block *sb = mnt_path.dentry->d_sb;
int err = 0;
@@ -6646,7 +6644,7 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
/* device */
if (sb->s_op->show_devname) {
seq_puts(m, "device ");
-@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file
+@@ -203,7 +265,7 @@ static int show_vfsstat(struct seq_file
seq_puts(m, " mounted on ");
seq_path(m, &mnt_path, " \t\n\\");
seq_putc(m, ' ');
@@ -6655,10 +6653,10 @@ diff -NurpP --minimal linux-3.13.1/fs/proc_namespace.c linux-3.13.1-vs2.3.6.10/f
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.13.1/fs/quota/dquot.c linux-3.13.1-vs2.3.6.10/fs/quota/dquot.c
---- linux-3.13.1/fs/quota/dquot.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/quota/dquot.c 2014-01-31 20:38:03.000000000 +0000
-@@ -1594,6 +1594,9 @@ int __dquot_alloc_space(struct inode *in
+diff -NurpP --minimal linux-3.13.6/fs/quota/dquot.c linux-3.13.6-vs2.3.6.11/fs/quota/dquot.c
+--- linux-3.13.6/fs/quota/dquot.c 2014-03-12 13:51:21.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/quota/dquot.c 2014-03-12 15:51:07.000000000 +0000
+@@ -1602,6 +1602,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6668,7 +6666,7 @@ diff -NurpP --minimal linux-3.13.1/fs/quota/dquot.c linux-3.13.1-vs2.3.6.10/fs/q
/*
* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex
-@@ -1649,6 +1652,9 @@ int dquot_alloc_inode(const struct inode
+@@ -1657,6 +1660,9 @@ int dquot_alloc_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6678,7 +6676,7 @@ diff -NurpP --minimal linux-3.13.1/fs/quota/dquot.c linux-3.13.1-vs2.3.6.10/fs/q
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-@@ -1749,6 +1755,8 @@ void __dquot_free_space(struct inode *in
+@@ -1757,6 +1763,8 @@ void __dquot_free_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6687,7 +6685,7 @@ diff -NurpP --minimal linux-3.13.1/fs/quota/dquot.c linux-3.13.1-vs2.3.6.10/fs/q
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode)) {
-@@ -1793,6 +1801,8 @@ void dquot_free_inode(const struct inode
+@@ -1801,6 +1809,8 @@ void dquot_free_inode(const struct inode
struct dquot_warn warn[MAXQUOTAS];
struct dquot * const *dquots = inode->i_dquot;
@@ -6696,9 +6694,9 @@ diff -NurpP --minimal linux-3.13.1/fs/quota/dquot.c linux-3.13.1-vs2.3.6.10/fs/q
/* 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.13.1/fs/quota/quota.c linux-3.13.1-vs2.3.6.10/fs/quota/quota.c
---- linux-3.13.1/fs/quota/quota.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/quota/quota.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/quota/quota.c linux-3.13.6-vs2.3.6.11/fs/quota/quota.c
+--- linux-3.13.6/fs/quota/quota.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/quota/quota.c 2014-01-31 20:38:03.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6786,9 +6784,9 @@ diff -NurpP --minimal linux-3.13.1/fs/quota/quota.c linux-3.13.1-vs2.3.6.10/fs/q
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.13.1/fs/stat.c linux-3.13.1-vs2.3.6.10/fs/stat.c
---- linux-3.13.1/fs/stat.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/stat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/stat.c linux-3.13.6-vs2.3.6.11/fs/stat.c
+--- linux-3.13.6/fs/stat.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/stat.c 2014-01-31 20:38:03.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6797,9 +6795,9 @@ diff -NurpP --minimal linux-3.13.1/fs/stat.c linux-3.13.1-vs2.3.6.10/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.13.1/fs/statfs.c linux-3.13.1-vs2.3.6.10/fs/statfs.c
---- linux-3.13.1/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/statfs.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/statfs.c linux-3.13.6-vs2.3.6.11/fs/statfs.c
+--- linux-3.13.6/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/statfs.c 2014-01-31 20:38:03.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6818,9 +6816,9 @@ diff -NurpP --minimal linux-3.13.1/fs/statfs.c linux-3.13.1-vs2.3.6.10/fs/statfs
return retval;
}
-diff -NurpP --minimal linux-3.13.1/fs/super.c linux-3.13.1-vs2.3.6.10/fs/super.c
---- linux-3.13.1/fs/super.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/super.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/super.c linux-3.13.6-vs2.3.6.11/fs/super.c
+--- linux-3.13.6/fs/super.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/super.c 2014-01-31 20:38:03.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6844,9 +6842,9 @@ diff -NurpP --minimal linux-3.13.1/fs/super.c linux-3.13.1-vs2.3.6.10/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.13.1/fs/sysfs/mount.c linux-3.13.1-vs2.3.6.10/fs/sysfs/mount.c
---- linux-3.13.1/fs/sysfs/mount.c 2013-11-25 15:47:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/sysfs/mount.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/sysfs/mount.c linux-3.13.6-vs2.3.6.11/fs/sysfs/mount.c
+--- linux-3.13.6/fs/sysfs/mount.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/sysfs/mount.c 2014-01-31 20:38:03.000000000 +0000
@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -6856,9 +6854,9 @@ diff -NurpP --minimal linux-3.13.1/fs/sysfs/mount.c linux-3.13.1-vs2.3.6.10/fs/s
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.13.1/fs/utimes.c linux-3.13.1-vs2.3.6.10/fs/utimes.c
---- linux-3.13.1/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/utimes.c 2014-01-31 23:49:14.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/utimes.c linux-3.13.6-vs2.3.6.11/fs/utimes.c
+--- linux-3.13.6/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/utimes.c 2014-01-31 23:49:14.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6889,9 +6887,9 @@ diff -NurpP --minimal linux-3.13.1/fs/utimes.c linux-3.13.1-vs2.3.6.10/fs/utimes
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.13.1/fs/xattr.c linux-3.13.1-vs2.3.6.10/fs/xattr.c
---- linux-3.13.1/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/fs/xattr.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/fs/xattr.c linux-3.13.6-vs2.3.6.11/fs/xattr.c
+--- linux-3.13.6/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/fs/xattr.c 2014-01-31 20:38:03.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6909,9 +6907,9 @@ diff -NurpP --minimal linux-3.13.1/fs/xattr.c linux-3.13.1-vs2.3.6.10/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.13.1/include/linux/cred.h linux-3.13.1-vs2.3.6.10/include/linux/cred.h
---- linux-3.13.1/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/cred.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/cred.h linux-3.13.6-vs2.3.6.11/include/linux/cred.h
+--- linux-3.13.6/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/cred.h 2014-01-31 20:38:03.000000000 +0000
@@ -143,6 +143,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 *);
@@ -6952,18 +6950,18 @@ diff -NurpP --minimal linux-3.13.1/include/linux/cred.h linux-3.13.1-vs2.3.6.10/
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.13.1/include/linux/devpts_fs.h linux-3.13.1-vs2.3.6.10/include/linux/devpts_fs.h
---- linux-3.13.1/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/devpts_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/devpts_fs.h linux-3.13.6-vs2.3.6.11/include/linux/devpts_fs.h
+--- linux-3.13.6/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/devpts_fs.h 2014-01-31 20:38:03.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/fs.h linux-3.13.1-vs2.3.6.10/include/linux/fs.h
---- linux-3.13.1/include/linux/fs.h 2014-01-22 20:39:10.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/fs.h 2014-01-31 23:33:22.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/fs.h linux-3.13.6-vs2.3.6.11/include/linux/fs.h
+--- linux-3.13.6/include/linux/fs.h 2014-01-22 20:39:10.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/fs.h 2014-01-31 23:33:22.000000000 +0000
@@ -213,6 +213,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7129,9 +7127,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/fs.h linux-3.13.1-vs2.3.6.10/in
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.13.1/include/linux/init_task.h linux-3.13.1-vs2.3.6.10/include/linux/init_task.h
---- linux-3.13.1/include/linux/init_task.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/init_task.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/init_task.h linux-3.13.6-vs2.3.6.11/include/linux/init_task.h
+--- linux-3.13.6/include/linux/init_task.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/init_task.h 2014-01-31 20:38:03.000000000 +0000
@@ -222,6 +222,10 @@ extern struct task_group root_task_group
INIT_TASK_RCU_PREEMPT(tsk) \
INIT_CPUSET_SEQ(tsk) \
@@ -7143,9 +7141,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/init_task.h linux-3.13.1-vs2.3.
}
-diff -NurpP --minimal linux-3.13.1/include/linux/ipc.h linux-3.13.1-vs2.3.6.10/include/linux/ipc.h
---- linux-3.13.1/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/ipc.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/ipc.h linux-3.13.6-vs2.3.6.11/include/linux/ipc.h
+--- linux-3.13.6/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/ipc.h 2014-01-31 20:38:03.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -7154,9 +7152,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/ipc.h linux-3.13.1-vs2.3.6.10/i
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.13.1/include/linux/memcontrol.h linux-3.13.1-vs2.3.6.10/include/linux/memcontrol.h
---- linux-3.13.1/include/linux/memcontrol.h 2013-11-25 15:47:01.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/memcontrol.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/memcontrol.h linux-3.13.6-vs2.3.6.11/include/linux/memcontrol.h
+--- linux-3.13.6/include/linux/memcontrol.h 2013-11-25 15:47:01.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/memcontrol.h 2014-01-31 20:38:03.000000000 +0000
@@ -99,6 +99,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_css(struct cgroup_subsys_state *css);
@@ -7171,9 +7169,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/memcontrol.h linux-3.13.1-vs2.3
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.13.1/include/linux/mm_types.h linux-3.13.1-vs2.3.6.10/include/linux/mm_types.h
---- linux-3.13.1/include/linux/mm_types.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/mm_types.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/mm_types.h linux-3.13.6-vs2.3.6.11/include/linux/mm_types.h
+--- linux-3.13.6/include/linux/mm_types.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/mm_types.h 2014-01-31 20:38:03.000000000 +0000
@@ -397,6 +397,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -7182,9 +7180,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/mm_types.h linux-3.13.1-vs2.3.6
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.13.1/include/linux/mount.h linux-3.13.1-vs2.3.6.10/include/linux/mount.h
---- linux-3.13.1/include/linux/mount.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/mount.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/mount.h linux-3.13.6-vs2.3.6.11/include/linux/mount.h
+--- linux-3.13.6/include/linux/mount.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/mount.h 2014-01-31 20:38:03.000000000 +0000
@@ -52,6 +52,9 @@ struct mnt_namespace;
#define MNT_DOOMED 0x1000000
#define MNT_SYNC_UMOUNT 0x2000000
@@ -7195,9 +7193,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/mount.h linux-3.13.1-vs2.3.6.10
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.13.1/include/linux/net.h linux-3.13.1-vs2.3.6.10/include/linux/net.h
---- linux-3.13.1/include/linux/net.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/net.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/net.h linux-3.13.6-vs2.3.6.11/include/linux/net.h
+--- linux-3.13.6/include/linux/net.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/net.h 2014-01-31 20:38:03.000000000 +0000
@@ -39,6 +39,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -7206,9 +7204,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/net.h linux-3.13.1-vs2.3.6.10/i
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.13.1/include/linux/netdevice.h linux-3.13.1-vs2.3.6.10/include/linux/netdevice.h
---- linux-3.13.1/include/linux/netdevice.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/netdevice.h 2014-01-31 20:44:02.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/netdevice.h linux-3.13.6-vs2.3.6.11/include/linux/netdevice.h
+--- linux-3.13.6/include/linux/netdevice.h 2014-03-12 13:51:21.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/netdevice.h 2014-03-12 15:51:07.000000000 +0000
@@ -1839,6 +1839,7 @@ int init_dummy_netdev(struct net_device
struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -7217,9 +7215,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/netdevice.h linux-3.13.1-vs2.3.
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
int netdev_get_name(struct net *net, char *name, int ifindex);
int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-3.13.1/include/linux/nsproxy.h linux-3.13.1-vs2.3.6.10/include/linux/nsproxy.h
---- linux-3.13.1/include/linux/nsproxy.h 2013-11-25 15:45:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/nsproxy.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/nsproxy.h linux-3.13.6-vs2.3.6.11/include/linux/nsproxy.h
+--- linux-3.13.6/include/linux/nsproxy.h 2013-11-25 15:45:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/nsproxy.h 2014-01-31 20:38:03.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -7269,9 +7267,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/nsproxy.h linux-3.13.1-vs2.3.6.
}
#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/pid.h linux-3.13.1-vs2.3.6.10/include/linux/pid.h
---- linux-3.13.1/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/pid.h linux-3.13.6-vs2.3.6.11/include/linux/pid.h
+--- linux-3.13.6/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/pid.h 2014-01-31 20:38:03.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -7290,9 +7288,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/pid.h linux-3.13.1-vs2.3.6.10/i
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.13.1/include/linux/quotaops.h linux-3.13.1-vs2.3.6.10/include/linux/quotaops.h
---- linux-3.13.1/include/linux/quotaops.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/quotaops.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/quotaops.h linux-3.13.6-vs2.3.6.11/include/linux/quotaops.h
+--- linux-3.13.6/include/linux/quotaops.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/quotaops.h 2014-01-31 20:38:03.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -7334,9 +7332,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/quotaops.h linux-3.13.1-vs2.3.6
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.13.1/include/linux/sched.h linux-3.13.1-vs2.3.6.10/include/linux/sched.h
---- linux-3.13.1/include/linux/sched.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/sched.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/sched.h linux-3.13.6-vs2.3.6.11/include/linux/sched.h
+--- linux-3.13.6/include/linux/sched.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/sched.h 2014-01-31 20:38:03.000000000 +0000
@@ -1237,6 +1237,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -7383,9 +7381,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/sched.h linux-3.13.1-vs2.3.6.10
}
-diff -NurpP --minimal linux-3.13.1/include/linux/shmem_fs.h linux-3.13.1-vs2.3.6.10/include/linux/shmem_fs.h
---- linux-3.13.1/include/linux/shmem_fs.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/shmem_fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/shmem_fs.h linux-3.13.6-vs2.3.6.11/include/linux/shmem_fs.h
+--- linux-3.13.6/include/linux/shmem_fs.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/shmem_fs.h 2014-01-31 20:38:03.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
@@ -7396,9 +7394,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/shmem_fs.h linux-3.13.1-vs2.3.6
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.13.1/include/linux/stat.h linux-3.13.1-vs2.3.6.10/include/linux/stat.h
---- linux-3.13.1/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/stat.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/stat.h linux-3.13.6-vs2.3.6.11/include/linux/stat.h
+--- linux-3.13.6/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/stat.h 2014-01-31 20:38:03.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -7407,9 +7405,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/stat.h linux-3.13.1-vs2.3.6.10/
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.13.1/include/linux/sunrpc/auth.h linux-3.13.1-vs2.3.6.10/include/linux/sunrpc/auth.h
---- linux-3.13.1/include/linux/sunrpc/auth.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/sunrpc/auth.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/sunrpc/auth.h linux-3.13.6-vs2.3.6.11/include/linux/sunrpc/auth.h
+--- linux-3.13.6/include/linux/sunrpc/auth.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/sunrpc/auth.h 2014-01-31 20:38:03.000000000 +0000
@@ -36,6 +36,7 @@ enum {
struct auth_cred {
kuid_t uid;
@@ -7418,9 +7416,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/sunrpc/auth.h linux-3.13.1-vs2.
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-3.13.1/include/linux/sunrpc/clnt.h linux-3.13.1-vs2.3.6.10/include/linux/sunrpc/clnt.h
---- linux-3.13.1/include/linux/sunrpc/clnt.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/sunrpc/clnt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/sunrpc/clnt.h linux-3.13.6-vs2.3.6.11/include/linux/sunrpc/clnt.h
+--- linux-3.13.6/include/linux/sunrpc/clnt.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/sunrpc/clnt.h 2014-01-31 20:38:03.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
@@ -7431,9 +7429,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/sunrpc/clnt.h linux-3.13.1-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.13.1/include/linux/sysfs.h linux-3.13.1-vs2.3.6.10/include/linux/sysfs.h
---- linux-3.13.1/include/linux/sysfs.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/sysfs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/sysfs.h linux-3.13.6-vs2.3.6.11/include/linux/sysfs.h
+--- linux-3.13.6/include/linux/sysfs.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/sysfs.h 2014-01-31 20:38:03.000000000 +0000
@@ -20,6 +20,8 @@
#include <linux/stat.h>
#include <linux/atomic.h>
@@ -7443,9 +7441,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/sysfs.h linux-3.13.1-vs2.3.6.10
struct kobject;
struct module;
struct bin_attribute;
-diff -NurpP --minimal linux-3.13.1/include/linux/types.h linux-3.13.1-vs2.3.6.10/include/linux/types.h
---- linux-3.13.1/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/types.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/types.h linux-3.13.6-vs2.3.6.11/include/linux/types.h
+--- linux-3.13.6/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/types.h 2014-01-31 20:38:03.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -7456,9 +7454,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/types.h linux-3.13.1-vs2.3.6.10
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.13.1/include/linux/uidgid.h linux-3.13.1-vs2.3.6.10/include/linux/uidgid.h
---- linux-3.13.1/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/uidgid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/uidgid.h linux-3.13.6-vs2.3.6.11/include/linux/uidgid.h
+--- linux-3.13.6/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/uidgid.h 2014-01-31 20:38:03.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -7578,9 +7576,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/uidgid.h linux-3.13.1-vs2.3.6.1
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.13.1/include/linux/vroot.h linux-3.13.1-vs2.3.6.10/include/linux/vroot.h
---- linux-3.13.1/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vroot.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vroot.h linux-3.13.6-vs2.3.6.11/include/linux/vroot.h
+--- linux-3.13.6/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vroot.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7633,9 +7631,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vroot.h linux-3.13.1-vs2.3.6.10
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_base.h linux-3.13.1-vs2.3.6.10/include/linux/vs_base.h
---- linux-3.13.1/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_base.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_base.h linux-3.13.6-vs2.3.6.11/include/linux/vs_base.h
+--- linux-3.13.6/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_base.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -7647,9 +7645,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_base.h linux-3.13.1-vs2.3.6.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_context.h linux-3.13.1-vs2.3.6.10/include/linux/vs_context.h
---- linux-3.13.1/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_context.h linux-3.13.6-vs2.3.6.11/include/linux/vs_context.h
+--- linux-3.13.6/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_context.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -7893,9 +7891,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_context.h linux-3.13.1-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_cowbl.h linux-3.13.1-vs2.3.6.10/include/linux/vs_cowbl.h
---- linux-3.13.1/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_cowbl.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_cowbl.h linux-3.13.6-vs2.3.6.11/include/linux/vs_cowbl.h
+--- linux-3.13.6/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_cowbl.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -7945,9 +7943,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_cowbl.h linux-3.13.1-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_cvirt.h linux-3.13.1-vs2.3.6.10/include/linux/vs_cvirt.h
---- linux-3.13.1/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_cvirt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_cvirt.h linux-3.13.6-vs2.3.6.11/include/linux/vs_cvirt.h
+--- linux-3.13.6/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_cvirt.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -7999,9 +7997,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_cvirt.h linux-3.13.1-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_device.h linux-3.13.1-vs2.3.6.10/include/linux/vs_device.h
---- linux-3.13.1/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_device.h linux-3.13.6-vs2.3.6.11/include/linux/vs_device.h
+--- linux-3.13.6/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_device.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -8048,9 +8046,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_device.h linux-3.13.1-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_dlimit.h linux-3.13.1-vs2.3.6.10/include/linux/vs_dlimit.h
---- linux-3.13.1/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_dlimit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_dlimit.h linux-3.13.6-vs2.3.6.11/include/linux/vs_dlimit.h
+--- linux-3.13.6/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_dlimit.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -8267,9 +8265,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_dlimit.h linux-3.13.1-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_inet.h linux-3.13.1-vs2.3.6.10/include/linux/vs_inet.h
---- linux-3.13.1/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_inet.h 2014-02-01 00:32:45.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_inet.h linux-3.13.6-vs2.3.6.11/include/linux/vs_inet.h
+--- linux-3.13.6/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_inet.h 2014-02-01 00:32:45.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -8635,9 +8633,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_inet.h linux-3.13.1-vs2.3.6.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_inet6.h linux-3.13.1-vs2.3.6.10/include/linux/vs_inet6.h
---- linux-3.13.1/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_inet6.h 2014-02-01 00:35:02.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_inet6.h linux-3.13.6-vs2.3.6.11/include/linux/vs_inet6.h
+--- linux-3.13.6/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_inet6.h 2014-02-01 00:35:02.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -8896,9 +8894,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_inet6.h linux-3.13.1-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_limit.h linux-3.13.1-vs2.3.6.10/include/linux/vs_limit.h
---- linux-3.13.1/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_limit.h 2014-02-01 01:29:43.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_limit.h linux-3.13.6-vs2.3.6.11/include/linux/vs_limit.h
+--- linux-3.13.6/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_limit.h 2014-02-01 01:29:43.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -9040,9 +9038,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_limit.h linux-3.13.1-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_network.h linux-3.13.1-vs2.3.6.10/include/linux/vs_network.h
---- linux-3.13.1/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_network.h linux-3.13.6-vs2.3.6.11/include/linux/vs_network.h
+--- linux-3.13.6/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_network.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -9213,9 +9211,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_network.h linux-3.13.1-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_pid.h linux-3.13.1-vs2.3.6.10/include/linux/vs_pid.h
---- linux-3.13.1/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_pid.h linux-3.13.6-vs2.3.6.11/include/linux/vs_pid.h
+--- linux-3.13.6/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_pid.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -9267,9 +9265,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_pid.h linux-3.13.1-vs2.3.6.1
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_sched.h linux-3.13.1-vs2.3.6.10/include/linux/vs_sched.h
---- linux-3.13.1/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_sched.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_sched.h linux-3.13.6-vs2.3.6.11/include/linux/vs_sched.h
+--- linux-3.13.6/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_sched.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -9311,9 +9309,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_sched.h linux-3.13.1-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_socket.h linux-3.13.1-vs2.3.6.10/include/linux/vs_socket.h
---- linux-3.13.1/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_socket.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_socket.h linux-3.13.6-vs2.3.6.11/include/linux/vs_socket.h
+--- linux-3.13.6/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_socket.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -9382,9 +9380,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_socket.h linux-3.13.1-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_tag.h linux-3.13.1-vs2.3.6.10/include/linux/vs_tag.h
---- linux-3.13.1/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_tag.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_tag.h linux-3.13.6-vs2.3.6.11/include/linux/vs_tag.h
+--- linux-3.13.6/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_tag.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -9433,9 +9431,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_tag.h linux-3.13.1-vs2.3.6.1
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vs_time.h linux-3.13.1-vs2.3.6.10/include/linux/vs_time.h
---- linux-3.13.1/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vs_time.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vs_time.h linux-3.13.6-vs2.3.6.11/include/linux/vs_time.h
+--- linux-3.13.6/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vs_time.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -9456,9 +9454,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vs_time.h linux-3.13.1-vs2.3.6.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/base.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/base.h
---- linux-3.13.1/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/base.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/base.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/base.h
+--- linux-3.13.6/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/base.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -9644,9 +9642,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/base.h linux-3.13.1-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct.h
---- linux-3.13.1/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct.h
+--- linux-3.13.6/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -9663,9 +9661,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct.h linux-3.13.1-vs
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_cmd.h
---- linux-3.13.1/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_cmd.h
+--- linux-3.13.6/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -9677,9 +9675,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_cmd.h linux-3.13.
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_def.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_def.h
---- linux-3.13.1/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct_def.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_def.h
+--- linux-3.13.6/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_def.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -9724,9 +9722,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_int.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_int.h
---- linux-3.13.1/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cacct_int.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct_int.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_int.h
+--- linux-3.13.6/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cacct_int.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -9745,9 +9743,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cacct_int.h linux-3.13.
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/check.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/check.h
---- linux-3.13.1/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/check.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/check.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/check.h
+--- linux-3.13.6/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/check.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -9838,9 +9836,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/check.h linux-3.13.1-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/context.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/context.h
---- linux-3.13.1/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/context.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/context.h
+--- linux-3.13.6/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
@@ -9952,9 +9950,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/context.h linux-3.13.1-
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/context_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/context_cmd.h
---- linux-3.13.1/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/context_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/context_cmd.h
+--- linux-3.13.6/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
@@ -9989,9 +9987,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/context_cmd.h linux-3.1
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt.h
---- linux-3.13.1/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cvirt.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt.h
+--- linux-3.13.6/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -10011,9 +10009,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt.h linux-3.13.1-vs
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt_cmd.h
---- linux-3.13.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cvirt_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt_cmd.h
+--- linux-3.13.6/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
@@ -10028,9 +10026,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt_cmd.h linux-3.13.
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt_def.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt_def.h
---- linux-3.13.1/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/cvirt_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cvirt_def.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt_def.h
+--- linux-3.13.6/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/cvirt_def.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
@@ -10112,9 +10110,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/cvirt_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/debug.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/debug.h
---- linux-3.13.1/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/debug.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/debug.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/debug.h
+--- linux-3.13.6/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/debug.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
@@ -10262,9 +10260,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/debug.h linux-3.13.1-vs
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/debug_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/debug_cmd.h
---- linux-3.13.1/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/debug_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/debug_cmd.h
+--- linux-3.13.6/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
@@ -10303,9 +10301,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/debug_cmd.h linux-3.13.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/device.h
---- linux-3.13.1/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/device.h
+--- linux-3.13.6/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
@@ -10316,9 +10314,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device.h linux-3.13.1-v
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/device_cmd.h
---- linux-3.13.1/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/device_cmd.h
+--- linux-3.13.6/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
@@ -10351,9 +10349,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device_cmd.h linux-3.13
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device_def.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/device_def.h
---- linux-3.13.1/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/device_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device_def.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/device_def.h
+--- linux-3.13.6/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/device_def.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
@@ -10372,9 +10370,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/device_def.h linux-3.13
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/dlimit.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/dlimit.h
---- linux-3.13.1/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/dlimit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/dlimit.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/dlimit.h
+--- linux-3.13.6/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/dlimit.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
@@ -10430,9 +10428,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/dlimit.h linux-3.13.1-v
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/dlimit_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/dlimit_cmd.h
---- linux-3.13.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/dlimit_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/dlimit_cmd.h
+--- linux-3.13.6/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
@@ -10480,9 +10478,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/dlimit_cmd.h linux-3.13
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/global.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/global.h
---- linux-3.13.1/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/global.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/global.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/global.h
+--- linux-3.13.6/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/global.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
@@ -10503,9 +10501,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/global.h linux-3.13.1-v
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/history.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/history.h
---- linux-3.13.1/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/history.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/history.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/history.h
+--- linux-3.13.6/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/history.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
@@ -10704,9 +10702,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/history.h linux-3.13.1-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/inode.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/inode.h
---- linux-3.13.1/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/inode.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/inode.h
+--- linux-3.13.6/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
@@ -10727,9 +10725,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/inode.h linux-3.13.1-vs
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/inode_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/inode_cmd.h
---- linux-3.13.1/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/inode_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/inode_cmd.h
+--- linux-3.13.6/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
@@ -10767,9 +10765,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/inode_cmd.h linux-3.13.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit.h
---- linux-3.13.1/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit.h
+--- linux-3.13.6/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,61 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
@@ -10832,9 +10830,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit.h linux-3.13.1-vs
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_cmd.h
---- linux-3.13.1/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_cmd.h
+--- linux-3.13.6/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
@@ -10871,9 +10869,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_cmd.h linux-3.13.
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_def.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_def.h
---- linux-3.13.1/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_def.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_def.h
+--- linux-3.13.6/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_def.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
@@ -10922,9 +10920,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_int.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_int.h
---- linux-3.13.1/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/limit_int.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_int.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_int.h
+--- linux-3.13.6/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/limit_int.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
@@ -11119,9 +11117,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/limit_int.h linux-3.13.
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/monitor.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/monitor.h
---- linux-3.13.1/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/monitor.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/monitor.h
+--- linux-3.13.6/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
@@ -11129,9 +11127,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/monitor.h linux-3.13.1-
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/network.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/network.h
---- linux-3.13.1/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/network.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/network.h
+--- linux-3.13.6/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
@@ -11209,9 +11207,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/network.h linux-3.13.1-
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/network_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/network_cmd.h
---- linux-3.13.1/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/network_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/network_cmd.h
+--- linux-3.13.6/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
@@ -11250,9 +11248,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/network_cmd.h linux-3.1
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/percpu.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/percpu.h
---- linux-3.13.1/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/percpu.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/percpu.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/percpu.h
+--- linux-3.13.6/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/percpu.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
@@ -11268,9 +11266,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/percpu.h linux-3.13.1-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/pid.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/pid.h
---- linux-3.13.1/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/pid.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/pid.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/pid.h
+--- linux-3.13.6/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/pid.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -11323,9 +11321,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/pid.h linux-3.13.1-vs2.
+}
+
+#endif
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched.h
---- linux-3.13.1/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/sched.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched.h
+--- linux-3.13.6/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
@@ -11350,9 +11348,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched.h linux-3.13.1-vs
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched_cmd.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched_cmd.h
---- linux-3.13.1/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/sched_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched_cmd.h
+--- linux-3.13.6/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
@@ -11365,9 +11363,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched_cmd.h linux-3.13.
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched_def.h linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched_def.h
---- linux-3.13.1/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.1-vs2.3.6.10/include/linux/vserver/sched_def.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.6/include/linux/vserver/sched_def.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched_def.h
+--- linux-3.13.6/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/sched_def.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
@@ -11407,9 +11405,9 @@ diff -NurpP --minimal linux-3.13.1/include/linux/vserver/sched_def.h linux-3.13.
<Skipped 2235 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/98d9a5b13a9fdbeba1834fcecaa96ca73e073698
More information about the pld-cvs-commit
mailing list