[packages/kernel] - vserver patch updated to patch-3.13.10-vs2.3.6.11.diff
baggins
baggins at pld-linux.org
Thu Apr 24 13:34:06 CEST 2014
commit 978063ceda831ec9e43dbd332fb4804dd81021fd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Apr 24 13:33:12 2014 +0200
- vserver patch updated to patch-3.13.10-vs2.3.6.11.diff
kernel-vserver-2.3.patch | 2444 +++++++++++++++++++++++-----------------------
1 file changed, 1223 insertions(+), 1221 deletions(-)
---
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index c83ccc6..ad79292 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-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
+diff -NurpP --minimal linux-3.13.10/Documentation/vserver/debug.txt linux-3.13.10-vs2.3.6.11/Documentation/vserver/debug.txt
+--- linux-3.13.10/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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.6/Documentation/vserver/debug.txt linux-3.13.6-
+ 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.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
+diff -NurpP --minimal linux-3.13.10/arch/alpha/Kconfig linux-3.13.10-vs2.3.6.11/arch/alpha/Kconfig
+--- linux-3.13.10/arch/alpha/Kconfig 2014-01-22 20:38:09.000000000 +0000
++++ linux-3.13.10-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.6/arch/alpha/Kconfig linux-3.13.6-vs2.3.6.11/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/alpha/kernel/systbls.S linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/systbls.S
+--- linux-3.13.10/arch/alpha/kernel/systbls.S 2013-11-25 15:44:11.000000000 +0000
++++ linux-3.13.10-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.6/arch/alpha/kernel/systbls.S linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/alpha/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/alpha/kernel/traps.c
+--- linux-3.13.10/arch/alpha/kernel/traps.c 2014-01-22 20:38:10.000000000 +0000
++++ linux-3.13.10-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,10 +193,10 @@ diff -NurpP --minimal linux-3.13.6/arch/alpha/kernel/traps.c linux-3.13.6-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.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"
+diff -NurpP --minimal linux-3.13.10/arch/arm/Kconfig linux-3.13.10-vs2.3.6.11/arch/arm/Kconfig
+--- linux-3.13.10/arch/arm/Kconfig 2014-04-17 01:12:06.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/arch/arm/Kconfig 2014-04-17 01:17:10.000000000 +0000
+@@ -2267,6 +2267,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.13.6/arch/arm/Kconfig linux-3.13.6-vs2.3.6.11/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/arm/kernel/calls.S linux-3.13.10-vs2.3.6.11/arch/arm/kernel/calls.S
+--- linux-3.13.10/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.13.10-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.6/arch/arm/kernel/calls.S linux-3.13.6-vs2.3.6.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-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
+diff -NurpP --minimal linux-3.13.10/arch/arm/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/arm/kernel/traps.c
+--- linux-3.13.10/arch/arm/kernel/traps.c 2014-01-22 20:38:11.000000000 +0000
++++ linux-3.13.10-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.6/arch/arm/kernel/traps.c linux-3.13.6-vs2.3.6.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-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
+diff -NurpP --minimal linux-3.13.10/arch/cris/Kconfig linux-3.13.10-vs2.3.6.11/arch/cris/Kconfig
+--- linux-3.13.10/arch/cris/Kconfig 2014-01-22 20:38:15.000000000 +0000
++++ linux-3.13.10-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.6/arch/cris/Kconfig linux-3.13.6-vs2.3.6.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/ia64/Kconfig linux-3.13.10-vs2.3.6.11/arch/ia64/Kconfig
+--- linux-3.13.10/arch/ia64/Kconfig 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.10-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.6/arch/ia64/Kconfig linux-3.13.6-vs2.3.6.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/entry.S linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/entry.S
+--- linux-3.13.10/arch/ia64/kernel/entry.S 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.10-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.6/arch/ia64/kernel/entry.S linux-3.13.6-vs2.3.6
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-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
+diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/ptrace.c
+--- linux-3.13.10/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.13.10-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.6/arch/ia64/kernel/ptrace.c linux-3.13.6-vs2.3.
#include <asm/pgtable.h>
#include <asm/processor.h>
-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
+diff -NurpP --minimal linux-3.13.10/arch/ia64/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/ia64/kernel/traps.c
+--- linux-3.13.10/arch/ia64/kernel/traps.c 2013-11-25 15:44:20.000000000 +0000
++++ linux-3.13.10-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.6/arch/ia64/kernel/traps.c linux-3.13.6-vs2.3.6
}
}
}
-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
+diff -NurpP --minimal linux-3.13.10/arch/m32r/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/m32r/kernel/traps.c
+--- linux-3.13.10/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.13.10-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,10 +320,10 @@ diff -NurpP --minimal linux-3.13.6/arch/m32r/kernel/traps.c linux-3.13.6-vs2.3.6
/*
* When in-kernel, we also print out the stack and code at the
-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"
+diff -NurpP --minimal linux-3.13.10/arch/m68k/Kconfig linux-3.13.10-vs2.3.6.11/arch/m68k/Kconfig
+--- linux-3.13.10/arch/m68k/Kconfig 2014-04-17 01:12:07.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/arch/m68k/Kconfig 2014-04-17 01:17:10.000000000 +0000
+@@ -135,6 +135,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -332,9 +332,9 @@ diff -NurpP --minimal linux-3.13.6/arch/m68k/Kconfig linux-3.13.6-vs2.3.6.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/Kconfig linux-3.13.10-vs2.3.6.11/arch/mips/Kconfig
+--- linux-3.13.10/arch/mips/Kconfig 2014-01-22 20:38:16.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/Kconfig linux-3.13.6-vs2.3.6.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/mips/kernel/ptrace.c
+--- linux-3.13.10/arch/mips/kernel/ptrace.c 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/ptrace.c linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall32-o32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall32-o32.S
+--- linux-3.13.10/arch/mips/kernel/scall32-o32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/scall32-o32.S linux-3.13.6-v
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-64.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-64.S
+--- linux-3.13.10/arch/mips/kernel/scall64-64.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/scall64-64.S linux-3.13.6-vs
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-n32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-n32.S
+--- linux-3.13.10/arch/mips/kernel/scall64-n32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/scall64-n32.S linux-3.13.6-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/scall64-o32.S linux-3.13.10-vs2.3.6.11/arch/mips/kernel/scall64-o32.S
+--- linux-3.13.10/arch/mips/kernel/scall64-o32.S 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/scall64-o32.S linux-3.13.6-v
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-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
+diff -NurpP --minimal linux-3.13.10/arch/mips/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/mips/kernel/traps.c
+--- linux-3.13.10/arch/mips/kernel/traps.c 2014-01-22 20:38:17.000000000 +0000
++++ linux-3.13.10-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.6/arch/mips/kernel/traps.c linux-3.13.6-vs2.3.6
if (cpu_has_userlocal) {
unsigned long tls;
-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
+diff -NurpP --minimal linux-3.13.10/arch/parisc/Kconfig linux-3.13.10-vs2.3.6.11/arch/parisc/Kconfig
+--- linux-3.13.10/arch/parisc/Kconfig 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.10-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.6/arch/parisc/Kconfig linux-3.13.6-vs2.3.6.11/a
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/parisc/kernel/syscall_table.S linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/syscall_table.S
+--- linux-3.13.10/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
++++ linux-3.13.10-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.6/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.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
+diff -NurpP --minimal linux-3.13.10/arch/parisc/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/parisc/kernel/traps.c
+--- linux-3.13.10/arch/parisc/kernel/traps.c 2013-11-25 15:46:28.000000000 +0000
++++ linux-3.13.10-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.6/arch/parisc/kernel/traps.c linux-3.13.6-vs2.3
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-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
+diff -NurpP --minimal linux-3.13.10/arch/parisc/mm/fault.c linux-3.13.10-vs2.3.6.11/arch/parisc/mm/fault.c
+--- linux-3.13.10/arch/parisc/mm/fault.c 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.10-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.6/arch/parisc/mm/fault.c linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/powerpc/Kconfig linux-3.13.10-vs2.3.6.11/arch/powerpc/Kconfig
+--- linux-3.13.10/arch/powerpc/Kconfig 2014-01-22 20:38:18.000000000 +0000
++++ linux-3.13.10-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.6/arch/powerpc/Kconfig linux-3.13.6-vs2.3.6.11/
source "security/Kconfig"
config KEYS_COMPAT
-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
+diff -NurpP --minimal linux-3.13.10/arch/powerpc/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.13.10/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.13.10-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.6/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.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
+diff -NurpP --minimal linux-3.13.10/arch/powerpc/kernel/traps.c linux-3.13.10-vs2.3.6.11/arch/powerpc/kernel/traps.c
+--- linux-3.13.10/arch/powerpc/kernel/traps.c 2014-01-22 20:38:23.000000000 +0000
++++ linux-3.13.10-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,10 +534,10 @@ diff -NurpP --minimal linux-3.13.6/arch/powerpc/kernel/traps.c linux-3.13.6-vs2.
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-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"
+diff -NurpP --minimal linux-3.13.10/arch/s390/Kconfig linux-3.13.10-vs2.3.6.11/arch/s390/Kconfig
+--- linux-3.13.10/arch/s390/Kconfig 2014-04-17 01:12:08.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/arch/s390/Kconfig 2014-04-17 01:17:10.000000000 +0000
+@@ -650,6 +650,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-3.13.6/arch/s390/Kconfig linux-3.13.6-vs2.3.6.11/arc
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/s390/include/asm/tlb.h linux-3.13.10-vs2.3.6.11/arch/s390/include/asm/tlb.h
+--- linux-3.13.10/arch/s390/include/asm/tlb.h 2013-11-25 15:46:29.000000000 +0000
++++ linux-3.13.10-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.6/arch/s390/include/asm/tlb.h linux-3.13.6-vs2.
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-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
+diff -NurpP --minimal linux-3.13.10/arch/s390/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.13.10/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.13.10-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.6/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.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
+diff -NurpP --minimal linux-3.13.10/arch/s390/kernel/ptrace.c linux-3.13.10-vs2.3.6.11/arch/s390/kernel/ptrace.c
+--- linux-3.13.10/arch/s390/kernel/ptrace.c 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.10-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.6/arch/s390/kernel/ptrace.c linux-3.13.6-vs2.3.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-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
+diff -NurpP --minimal linux-3.13.10/arch/s390/kernel/syscalls.S linux-3.13.10-vs2.3.6.11/arch/s390/kernel/syscalls.S
+--- linux-3.13.10/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
++++ linux-3.13.10-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.6/arch/s390/kernel/syscalls.S linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/sh/Kconfig linux-3.13.10-vs2.3.6.11/arch/sh/Kconfig
+--- linux-3.13.10/arch/sh/Kconfig 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.10-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.6/arch/sh/Kconfig linux-3.13.6-vs2.3.6.11/arch/
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/sh/kernel/irq.c linux-3.13.10-vs2.3.6.11/arch/sh/kernel/irq.c
+--- linux-3.13.10/arch/sh/kernel/irq.c 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.10-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.6/arch/sh/kernel/irq.c linux-3.13.6-vs2.3.6.11/
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-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
+diff -NurpP --minimal linux-3.13.10/arch/sparc/Kconfig linux-3.13.10-vs2.3.6.11/arch/sparc/Kconfig
+--- linux-3.13.10/arch/sparc/Kconfig 2014-01-22 20:38:24.000000000 +0000
++++ linux-3.13.10-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.6/arch/sparc/Kconfig linux-3.13.6-vs2.3.6.11/ar
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/sparc/include/uapi/asm/unistd.h linux-3.13.10-vs2.3.6.11/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.13.10/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.13.10-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.6/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.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
+diff -NurpP --minimal linux-3.13.10/arch/sparc/kernel/systbls_32.S linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_32.S
+--- linux-3.13.10/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.13.10-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.6/arch/sparc/kernel/systbls_32.S linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/sparc/kernel/systbls_64.S linux-3.13.10-vs2.3.6.11/arch/sparc/kernel/systbls_64.S
+--- linux-3.13.10/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.13.10-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.6/arch/sparc/kernel/systbls_64.S linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/arch/um/Kconfig.rest linux-3.13.10-vs2.3.6.11/arch/um/Kconfig.rest
+--- linux-3.13.10/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.6/arch/um/Kconfig.rest linux-3.13.6-vs2.3.6.11/
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/x86/Kconfig linux-3.13.10-vs2.3.6.11/arch/x86/Kconfig
+--- linux-3.13.10/arch/x86/Kconfig 2014-01-22 20:38:25.000000000 +0000
++++ linux-3.13.10-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.6/arch/x86/Kconfig linux-3.13.6-vs2.3.6.11/arch
source "security/Kconfig"
source "crypto/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/arch/x86/syscalls/syscall_32.tbl linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.13.10/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
++++ linux-3.13.10-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.6/arch/x86/syscalls/syscall_32.tbl linux-3.13.6
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.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
+diff -NurpP --minimal linux-3.13.10/arch/x86/syscalls/syscall_64.tbl linux-3.13.10-vs2.3.6.11/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.13.10/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.13.10-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.6/arch/x86/syscalls/syscall_64.tbl linux-3.13.6
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.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
+diff -NurpP --minimal linux-3.13.10/drivers/block/Kconfig linux-3.13.10-vs2.3.6.11/drivers/block/Kconfig
+--- linux-3.13.10/drivers/block/Kconfig 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.10-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.6/drivers/block/Kconfig linux-3.13.6-vs2.3.6.11
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-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
+diff -NurpP --minimal linux-3.13.10/drivers/block/Makefile linux-3.13.10-vs2.3.6.11/drivers/block/Makefile
+--- linux-3.13.10/drivers/block/Makefile 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.10-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.6/drivers/block/Makefile linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/drivers/block/loop.c linux-3.13.10-vs2.3.6.11/drivers/block/loop.c
+--- linux-3.13.10/drivers/block/loop.c 2014-01-22 20:38:27.000000000 +0000
++++ linux-3.13.10-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.6/drivers/block/loop.c linux-3.13.6-vs2.3.6.11/
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-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
+diff -NurpP --minimal linux-3.13.10/drivers/block/loop.h linux-3.13.10-vs2.3.6.11/drivers/block/loop.h
+--- linux-3.13.10/drivers/block/loop.h 2013-11-25 15:44:28.000000000 +0000
++++ linux-3.13.10-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.6/drivers/block/loop.h linux-3.13.6-vs2.3.6.11/
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-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
+diff -NurpP --minimal linux-3.13.10/drivers/block/vroot.c linux-3.13.10-vs2.3.6.11/drivers/block/vroot.c
+--- linux-3.13.10/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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.6/drivers/block/vroot.c linux-3.13.6-vs2.3.6.11
+
+#endif
+
-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
+diff -NurpP --minimal linux-3.13.10/drivers/infiniband/Kconfig linux-3.13.10-vs2.3.6.11/drivers/infiniband/Kconfig
+--- linux-3.13.10/drivers/infiniband/Kconfig 2014-01-22 20:38:35.000000000 +0000
++++ linux-3.13.10-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.6/drivers/infiniband/Kconfig linux-3.13.6-vs2.3
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-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
+diff -NurpP --minimal linux-3.13.10/drivers/infiniband/core/addr.c linux-3.13.10-vs2.3.6.11/drivers/infiniband/core/addr.c
+--- linux-3.13.10/drivers/infiniband/core/addr.c 2013-11-25 15:44:35.000000000 +0000
++++ linux-3.13.10-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.6/drivers/infiniband/core/addr.c linux-3.13.6-v
if (ret)
goto put;
-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
+diff -NurpP --minimal linux-3.13.10/drivers/md/dm-ioctl.c linux-3.13.10-vs2.3.6.11/drivers/md/dm-ioctl.c
+--- linux-3.13.10/drivers/md/dm-ioctl.c 2014-01-22 20:38:36.000000000 +0000
++++ linux-3.13.10-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.6/drivers/md/dm-ioctl.c linux-3.13.6-vs2.3.6.11
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-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
+diff -NurpP --minimal linux-3.13.10/drivers/md/dm.c linux-3.13.10-vs2.3.6.11/drivers/md/dm.c
+--- linux-3.13.10/drivers/md/dm.c 2014-04-17 01:12:19.000000000 +0000
++++ linux-3.13.10-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,9 +1299,9 @@ diff -NurpP --minimal linux-3.13.6/drivers/md/dm.c linux-3.13.6-vs2.3.6.11/drive
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-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
+diff -NurpP --minimal linux-3.13.10/drivers/md/dm.h linux-3.13.10-vs2.3.6.11/drivers/md/dm.h
+--- linux-3.13.10/drivers/md/dm.h 2014-04-17 01:12:19.000000000 +0000
++++ linux-3.13.10-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.6/drivers/md/dm.h linux-3.13.6-vs2.3.6.11/drive
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-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
+diff -NurpP --minimal linux-3.13.10/drivers/net/tun.c linux-3.13.10-vs2.3.6.11/drivers/net/tun.c
+--- linux-3.13.10/drivers/net/tun.c 2014-04-17 01:12:21.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/drivers/net/tun.c 2014-04-17 01:17:10.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1355,7 +1355,7 @@ diff -NurpP --minimal linux-3.13.6/drivers/net/tun.c linux-3.13.6-vs2.3.6.11/dri
return -EPERM;
err = security_tun_dev_create();
if (err < 0)
-@@ -1967,6 +1971,16 @@ static long __tun_chr_ioctl(struct file
+@@ -1969,6 +1973,16 @@ static long __tun_chr_ioctl(struct file
from_kgid(&init_user_ns, tun->group));
break;
@@ -1372,9 +1372,9 @@ diff -NurpP --minimal linux-3.13.6/drivers/net/tun.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/drivers/tty/sysrq.c linux-3.13.10-vs2.3.6.11/drivers/tty/sysrq.c
+--- linux-3.13.10/drivers/tty/sysrq.c 2014-01-22 20:39:02.000000000 +0000
++++ linux-3.13.10-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.6/drivers/tty/sysrq.c linux-3.13.6-vs2.3.6.11/d
else
retval = -1;
return retval;
-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
+diff -NurpP --minimal linux-3.13.10/drivers/tty/tty_io.c linux-3.13.10-vs2.3.6.11/drivers/tty/tty_io.c
+--- linux-3.13.10/drivers/tty/tty_io.c 2014-01-22 20:39:02.000000000 +0000
++++ linux-3.13.10-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.6/drivers/tty/tty_io.c linux-3.13.6-vs2.3.6.11/
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-3.13.10/fs/attr.c linux-3.13.10-vs2.3.6.11/fs/attr.c
+--- linux-3.13.10/fs/attr.c 2014-04-17 01:12:31.000000000 +0000
++++ linux-3.13.10-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.6/fs/attr.c linux-3.13.6-vs2.3.6.11/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/block_dev.c linux-3.13.10-vs2.3.6.11/fs/block_dev.c
+--- linux-3.13.10/fs/block_dev.c 2013-11-25 15:46:58.000000000 +0000
++++ linux-3.13.10-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.6/fs/block_dev.c linux-3.13.6-vs2.3.6.11/fs/blo
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-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
+diff -NurpP --minimal linux-3.13.10/fs/btrfs/ctree.h linux-3.13.10-vs2.3.6.11/fs/btrfs/ctree.h
+--- linux-3.13.10/fs/btrfs/ctree.h 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.10-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.6/fs/btrfs/ctree.h linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/btrfs/disk-io.c linux-3.13.10-vs2.3.6.11/fs/btrfs/disk-io.c
+--- linux-3.13.10/fs/btrfs/disk-io.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.10-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.6/fs/btrfs/disk-io.c linux-3.13.6-vs2.3.6.11/fs
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-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
+diff -NurpP --minimal linux-3.13.10/fs/btrfs/inode.c linux-3.13.10-vs2.3.6.11/fs/btrfs/inode.c
+--- linux-3.13.10/fs/btrfs/inode.c 2014-04-17 01:12:31.000000000 +0000
++++ linux-3.13.10-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>
@@ -1689,9 +1689,9 @@ diff -NurpP --minimal linux-3.13.6/fs/btrfs/inode.c linux-3.13.6-vs2.3.6.11/fs/b
.get_acl = btrfs_get_acl,
.update_time = btrfs_update_time,
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/btrfs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/btrfs/ioctl.c
+--- linux-3.13.10/fs/btrfs/ioctl.c 2014-04-17 01:12:31.000000000 +0000
++++ linux-3.13.10-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.6/fs/btrfs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/b
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-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
+diff -NurpP --minimal linux-3.13.10/fs/btrfs/super.c linux-3.13.10-vs2.3.6.11/fs/btrfs/super.c
+--- linux-3.13.10/fs/btrfs/super.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.10-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.6/fs/btrfs/super.c linux-3.13.6-vs2.3.6.11/fs/b
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-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
+diff -NurpP --minimal linux-3.13.10/fs/char_dev.c linux-3.13.10-vs2.3.6.11/fs/char_dev.c
+--- linux-3.13.10/fs/char_dev.c 2014-01-22 20:39:05.000000000 +0000
++++ linux-3.13.10-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.6/fs/char_dev.c linux-3.13.6-vs2.3.6.11/fs/char
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-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
+diff -NurpP --minimal linux-3.13.10/fs/dcache.c linux-3.13.10-vs2.3.6.11/fs/dcache.c
+--- linux-3.13.10/fs/dcache.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/dcache.c 2014-04-17 01:17:10.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/prefetch.h>
#include <linux/ratelimit.h>
@@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.13.6/fs/dcache.c linux-3.13.6-vs2.3.6.11/fs/dcache
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-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
+diff -NurpP --minimal linux-3.13.10/fs/devpts/inode.c linux-3.13.10-vs2.3.6.11/fs/devpts/inode.c
+--- linux-3.13.10/fs/devpts/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.6/fs/devpts/inode.c linux-3.13.6-vs2.3.6.11/fs/
inode->i_private = priv;
sprintf(s, "%d", index);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/balloc.c linux-3.13.10-vs2.3.6.11/fs/ext2/balloc.c
+--- linux-3.13.10/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/balloc.c linux-3.13.6-vs2.3.6.11/fs/e
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/ext2.h linux-3.13.10-vs2.3.6.11/fs/ext2/ext2.h
+--- linux-3.13.10/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/ext2.h linux-3.13.6-vs2.3.6.11/fs/ext
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/file.c linux-3.13.10-vs2.3.6.11/fs/ext2/file.c
+--- linux-3.13.10/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext2/ialloc.c
+--- linux-3.13.10/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/ialloc.c linux-3.13.6-vs2.3.6.11/fs/e
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/inode.c linux-3.13.10-vs2.3.6.11/fs/ext2/inode.c
+--- linux-3.13.10/fs/ext2/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
error = dquot_transfer(inode, iattr);
if (error)
return error;
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext2/ioctl.c
+--- linux-3.13.10/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ex
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/namei.c linux-3.13.10-vs2.3.6.11/fs/ext2/namei.c
+--- linux-3.13.10/fs/ext2/namei.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/namei.c linux-3.13.6-vs2.3.6.11/fs/ex
+ .sync_flags = ext2_sync_flags,
.get_acl = ext2_get_acl,
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext2/super.c linux-3.13.10-vs2.3.6.11/fs/ext2/super.c
+--- linux-3.13.10/fs/ext2/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext2/super.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/ext3.h linux-3.13.10-vs2.3.6.11/fs/ext3/ext3.h
+--- linux-3.13.10/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/ext3.h linux-3.13.6-vs2.3.6.11/fs/ext
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/file.c linux-3.13.10-vs2.3.6.11/fs/ext3/file.c
+--- linux-3.13.10/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/file.c linux-3.13.6-vs2.3.6.11/fs/ext
+ .sync_flags = ext3_sync_flags,
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext3/ialloc.c
+--- linux-3.13.10/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/ialloc.c linux-3.13.6-vs2.3.6.11/fs/e
} else
inode_init_owner(inode, dir, mode);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/inode.c linux-3.13.10-vs2.3.6.11/fs/ext3/inode.c
+--- linux-3.13.10/fs/ext3/inode.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext3/ioctl.c
+--- linux-3.13.10/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ex
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/namei.c linux-3.13.10-vs2.3.6.11/fs/ext3/namei.c
+--- linux-3.13.10/fs/ext3/namei.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/namei.c linux-3.13.6-vs2.3.6.11/fs/ex
.get_acl = ext3_get_acl,
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext3/super.c linux-3.13.10-vs2.3.6.11/fs/ext3/super.c
+--- linux-3.13.10/fs/ext3/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext3/super.c linux-3.13.6-vs2.3.6.11/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/ext4.h linux-3.13.10-vs2.3.6.11/fs/ext4/ext4.h
+--- linux-3.13.10/fs/ext4/ext4.h 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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 */
@@ -2902,9 +2902,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/ext4.h linux-3.13.6-vs2.3.6.11/fs/ext
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/file.c linux-3.13.10-vs2.3.6.11/fs/ext4/file.c
+--- linux-3.13.10/fs/ext4/file.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext4/file.c linux-3.13.6-vs2.3.6.11/fs/ext
+ .sync_flags = ext4_sync_flags,
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/ialloc.c linux-3.13.10-vs2.3.6.11/fs/ext4/ialloc.c
+--- linux-3.13.10/fs/ext4/ialloc.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.6/fs/ext4/ialloc.c linux-3.13.6-vs2.3.6.11/fs/e
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/inode.c linux-3.13.10-vs2.3.6.11/fs/ext4/inode.c
+--- linux-3.13.10/fs/ext4/inode.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/ext4/inode.c 2014-04-17 01:28:13.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/aio.h>
@@ -2942,17 +2942,15 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4046,43 +4047,65 @@ void ext4_set_inode_flags(struct inode *
- {
+@@ -3929,42 +3930,67 @@ void ext4_set_inode_flags(struct inode *
unsigned int flags = EXT4_I(inode)->i_flags;
unsigned int new_fl = 0;
-+ unsigned int new_vf = 0;
-+
+
+ if (flags & EXT4_IMMUTABLE_FL)
+ new_fl |= S_IMMUTABLE;
+ if (flags & EXT4_IXUNLINK_FL)
+ new_fl |= S_IXUNLINK;
-
++
if (flags & EXT4_SYNC_FL)
new_fl |= S_SYNC;
if (flags & EXT4_APPEND_FL)
@@ -2963,16 +2961,20 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
new_fl |= S_DIRSYNC;
++
set_mask_bits(&inode->i_flags,
- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC, new_fl);
-+ S_IMMUTABLE|S_IXUNLINK|S_SYNC|S_APPEND|S_NOATIME|S_DIRSYNC,
-+ new_fl);
++ S_IXUNLINK | S_IMMUTABLE |
++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC, new_fl);
+
++ new_fl = 0;
+ if (flags & EXT4_BARRIER_FL)
-+ new_vf |= V_BARRIER;
++ new_fl |= V_BARRIER;
+ if (flags & EXT4_COW_FL)
-+ new_vf |= V_COW;
-+ set_mask_bits(&inode->i_vflags, V_BARRIER|V_COW, new_vf);
++ new_fl |= V_COW;
++
++ set_mask_bits(&inode->i_vflags,
++ V_BARRIER | V_COW, new_fl);
}
/* Propagate flags from i_flags to EXT4_I(inode)->i_flags */
@@ -3015,7 +3017,7 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4066,8 +4090,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -4069,8 +4095,10 @@ struct inode *ext4_iget(struct super_blo
i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
}
@@ -3028,7 +3030,7 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
-@@ -4295,8 +4321,10 @@ static int ext4_do_update_inode(handle_t
+@@ -4298,8 +4326,10 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -3041,7 +3043,7 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
if (!(test_opt(inode->i_sb, NO_UID32))) {
raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4319,6 +4347,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4322,6 +4352,9 @@ static int ext4_do_update_inode(handle_t
raw_inode->i_uid_high = 0;
raw_inode->i_gid_high = 0;
}
@@ -3051,7 +3053,7 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4550,7 +4581,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4553,7 +4586,8 @@ int ext4_setattr(struct dentry *dentry,
if (is_quota_modification(inode, attr))
dquot_initialize(inode);
if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
@@ -3061,7 +3063,7 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4573,6 +4605,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -4576,6 +4610,8 @@ int ext4_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3070,9 +3072,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/inode.c linux-3.13.6-vs2.3.6.11/fs/ex
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ext4/ioctl.c
+--- linux-3.13.10/fs/ext4/ioctl.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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>
@@ -3138,9 +3140,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ex
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/namei.c linux-3.13.10-vs2.3.6.11/fs/ext4/namei.c
+--- linux-3.13.10/fs/ext4/namei.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.10-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>
@@ -3165,9 +3167,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/namei.c linux-3.13.6-vs2.3.6.11/fs/ex
};
const struct inode_operations ext4_special_inode_operations = {
-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
+diff -NurpP --minimal linux-3.13.10/fs/ext4/super.c linux-3.13.10-vs2.3.6.11/fs/ext4/super.c
+--- linux-3.13.10/fs/ext4/super.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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,
@@ -3233,9 +3235,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ext4/super.c linux-3.13.6-vs2.3.6.11/fs/ex
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-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
+diff -NurpP --minimal linux-3.13.10/fs/fcntl.c linux-3.13.10-vs2.3.6.11/fs/fcntl.c
+--- linux-3.13.10/fs/fcntl.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -3253,9 +3255,9 @@ diff -NurpP --minimal linux-3.13.6/fs/fcntl.c linux-3.13.6-vs2.3.6.11/fs/fcntl.c
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-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
+diff -NurpP --minimal linux-3.13.10/fs/file.c linux-3.13.10-vs2.3.6.11/fs/file.c
+--- linux-3.13.10/fs/file.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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>
@@ -3310,9 +3312,9 @@ diff -NurpP --minimal linux-3.13.6/fs/file.c linux-3.13.6-vs2.3.6.11/fs/file.c
return fd;
-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
+diff -NurpP --minimal linux-3.13.10/fs/file_table.c linux-3.13.10-vs2.3.6.11/fs/file_table.c
+--- linux-3.13.10/fs/file_table.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -3349,9 +3351,9 @@ diff -NurpP --minimal linux-3.13.6/fs/file_table.c linux-3.13.6-vs2.3.6.11/fs/fi
file_free(file);
}
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/fs_struct.c linux-3.13.10-vs2.3.6.11/fs/fs_struct.c
+--- linux-3.13.10/fs/fs_struct.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -3376,9 +3378,9 @@ diff -NurpP --minimal linux-3.13.6/fs/fs_struct.c linux-3.13.6-vs2.3.6.11/fs/fs_
}
return fs;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/gfs2/file.c linux-3.13.10-vs2.3.6.11/fs/gfs2/file.c
+--- linux-3.13.10/fs/gfs2/file.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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,
@@ -3501,9 +3503,9 @@ diff -NurpP --minimal linux-3.13.6/fs/gfs2/file.c linux-3.13.6-vs2.3.6.11/fs/gfs
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-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
+diff -NurpP --minimal linux-3.13.10/fs/gfs2/inode.h linux-3.13.10-vs2.3.6.11/fs/gfs2/inode.h
+--- linux-3.13.10/fs/gfs2/inode.h 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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;
@@ -3512,9 +3514,9 @@ diff -NurpP --minimal linux-3.13.6/fs/gfs2/inode.h linux-3.13.6-vs2.3.6.11/fs/gf
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-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
+diff -NurpP --minimal linux-3.13.10/fs/hostfs/hostfs.h linux-3.13.10-vs2.3.6.11/fs/hostfs/hostfs.h
+--- linux-3.13.10/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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;
@@ -3523,9 +3525,9 @@ diff -NurpP --minimal linux-3.13.6/fs/hostfs/hostfs.h linux-3.13.6-vs2.3.6.11/fs
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-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
+diff -NurpP --minimal linux-3.13.10/fs/inode.c linux-3.13.10-vs2.3.6.11/fs/inode.c
+--- linux-3.13.10/fs/inode.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -3588,9 +3590,9 @@ diff -NurpP --minimal linux-3.13.6/fs/inode.c linux-3.13.6-vs2.3.6.11/fs/inode.c
}
EXPORT_SYMBOL(inode_init_owner);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ioctl.c
+--- linux-3.13.10/fs/ioctl.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -3601,9 +3603,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/ioctl.c
#include <asm/ioctls.h>
-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
+diff -NurpP --minimal linux-3.13.10/fs/ioprio.c linux-3.13.10-vs2.3.6.11/fs/ioprio.c
+--- linux-3.13.10/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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>
@@ -3630,9 +3632,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ioprio.c linux-3.13.6-vs2.3.6.11/fs/ioprio
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/file.c linux-3.13.10-vs2.3.6.11/fs/jfs/file.c
+--- linux-3.13.10/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.13.10-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);
@@ -3651,9 +3653,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/file.c linux-3.13.6-vs2.3.6.11/fs/jfs/
};
const struct file_operations jfs_file_operations = {
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/ioctl.c linux-3.13.10-vs2.3.6.11/fs/jfs/ioctl.c
+--- linux-3.13.10/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.10-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>
@@ -3711,9 +3713,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/ioctl.c linux-3.13.6-vs2.3.6.11/fs/jfs
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_dinode.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_dinode.h
+--- linux-3.13.10/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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 */
@@ -3730,9 +3732,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_dinode.h linux-3.13.6-vs2.3.6.11/f
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_filsys.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_filsys.h
+--- linux-3.13.10/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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
@@ -3741,9 +3743,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_filsys.h linux-3.13.6-vs2.3.6.11/f
/*
* file system state (superblock state)
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_imap.c linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_imap.c
+--- linux-3.13.10/fs/jfs/jfs_imap.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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>
@@ -3807,9 +3809,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_imap.c linux-3.13.6-vs2.3.6.11/fs/
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_inode.c linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.c
+--- linux-3.13.10/fs/jfs/jfs_inode.c 2013-11-25 15:46:59.000000000 +0000
++++ linux-3.13.10-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>
@@ -3883,9 +3885,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_inode.c linux-3.13.6-vs2.3.6.11/fs
}
/*
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/jfs_inode.h linux-3.13.10-vs2.3.6.11/fs/jfs/jfs_inode.h
+--- linux-3.13.10/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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);
@@ -3894,9 +3896,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/jfs_inode.h linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/namei.c linux-3.13.10-vs2.3.6.11/fs/jfs/namei.c
+--- linux-3.13.10/fs/jfs/namei.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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>
@@ -3921,9 +3923,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/namei.c linux-3.13.6-vs2.3.6.11/fs/jfs
};
const struct file_operations jfs_dir_operations = {
-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
+diff -NurpP --minimal linux-3.13.10/fs/jfs/super.c linux-3.13.10-vs2.3.6.11/fs/jfs/super.c
+--- linux-3.13.10/fs/jfs/super.c 2013-11-25 15:45:01.000000000 +0000
++++ linux-3.13.10-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,
@@ -3990,9 +3992,9 @@ diff -NurpP --minimal linux-3.13.6/fs/jfs/super.c linux-3.13.6-vs2.3.6.11/fs/jfs
if (newLVSize) {
pr_err("resize option for remount only\n");
-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
+diff -NurpP --minimal linux-3.13.10/fs/libfs.c linux-3.13.10-vs2.3.6.11/fs/libfs.c
+--- linux-3.13.10/fs/libfs.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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.
*/
@@ -4044,9 +4046,9 @@ diff -NurpP --minimal linux-3.13.6/fs/libfs.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/locks.c linux-3.13.10-vs2.3.6.11/fs/locks.c
+--- linux-3.13.10/fs/locks.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -4245,9 +4247,9 @@ diff -NurpP --minimal linux-3.13.6/fs/locks.c linux-3.13.6-vs2.3.6.11/fs/locks.c
return 0;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/mount.h linux-3.13.10-vs2.3.6.11/fs/mount.h
+--- linux-3.13.10/fs/mount.h 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/mount.h 2014-04-17 01:17:10.000000000 +0000
@@ -57,6 +57,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
@@ -4256,9 +4258,9 @@ diff -NurpP --minimal linux-3.13.6/fs/mount.h linux-3.13.6-vs2.3.6.11/fs/mount.h
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-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
+diff -NurpP --minimal linux-3.13.10/fs/namei.c linux-3.13.10-vs2.3.6.11/fs/namei.c
+--- linux-3.13.10/fs/namei.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/namei.c 2014-04-17 01:17:10.000000000 +0000
@@ -34,9 +34,19 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4385,7 +4387,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
retval = do_inode_permission(inode, mask);
if (retval)
return retval;
-@@ -1241,7 +1338,8 @@ static void follow_dotdot(struct nameida
+@@ -1238,7 +1335,8 @@ static void follow_dotdot(struct nameida
if (nd->path.dentry == nd->root.dentry &&
nd->path.mnt == nd->root.mnt) {
@@ -4395,7 +4397,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
}
if (nd->path.dentry != nd->path.mnt->mnt_root) {
/* rare case of legitimate dget_parent()... */
-@@ -1386,6 +1484,9 @@ static int lookup_fast(struct nameidata
+@@ -1383,6 +1481,9 @@ static int lookup_fast(struct nameidata
goto unlazy;
}
}
@@ -4405,7 +4407,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
path->mnt = mnt;
path->dentry = dentry;
if (unlikely(!__follow_mount_rcu(nd, path, inode)))
-@@ -1416,6 +1517,8 @@ unlazy:
+@@ -1413,6 +1514,8 @@ unlazy:
}
}
@@ -4414,7 +4416,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
path->mnt = mnt;
path->dentry = dentry;
err = follow_managed(path, nd->flags);
-@@ -2403,7 +2506,7 @@ static int may_delete(struct inode *dir,
+@@ -2400,7 +2503,7 @@ static int may_delete(struct inode *dir,
return -EPERM;
if (check_sticky(dir, inode) || IS_APPEND(inode) ||
@@ -4423,7 +4425,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
return -EPERM;
if (isdir) {
if (!d_is_directory(victim) && !d_is_autodir(victim))
-@@ -2483,19 +2586,25 @@ int vfs_create(struct inode *dir, struct
+@@ -2480,19 +2583,25 @@ int vfs_create(struct inode *dir, struct
bool want_excl)
{
int error = may_create(dir, dentry);
@@ -4451,7 +4453,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
return error;
}
-@@ -2530,6 +2639,15 @@ static int may_open(struct path *path, i
+@@ -2527,6 +2636,15 @@ static int may_open(struct path *path, i
break;
}
@@ -4467,7 +4469,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
error = inode_permission(inode, acc_mode);
if (error)
return error;
-@@ -3025,6 +3143,16 @@ finish_open:
+@@ -3022,6 +3140,16 @@ finish_open:
}
finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
@@ -4484,7 +4486,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
if (error)
goto out;
file->f_path.mnt = nd->path.mnt;
-@@ -3150,6 +3278,7 @@ static struct file *path_openat(int dfd,
+@@ -3147,6 +3275,7 @@ static struct file *path_openat(int dfd,
int opened = 0;
int error;
@@ -4492,7 +4494,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
file = get_empty_filp();
if (IS_ERR(file))
return file;
-@@ -3191,6 +3320,16 @@ static struct file *path_openat(int dfd,
+@@ -3188,6 +3317,16 @@ static struct file *path_openat(int dfd,
error = do_last(nd, &path, file, op, &opened, pathname);
put_link(nd, &link, cookie);
}
@@ -4509,7 +4511,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
out:
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT))
path_put(&nd->root);
-@@ -3306,6 +3445,11 @@ struct dentry *kern_path_create(int dfd,
+@@ -3303,6 +3442,11 @@ struct dentry *kern_path_create(int dfd,
goto fail;
}
*path = nd.path;
@@ -4521,7 +4523,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
return dentry;
fail:
dput(dentry);
-@@ -3853,7 +3997,7 @@ int vfs_link(struct dentry *old_dentry,
+@@ -3850,7 +3994,7 @@ int vfs_link(struct dentry *old_dentry,
/*
* A link to an append-only or immutable file cannot be created.
*/
@@ -4823,10 +4825,10 @@ diff -NurpP --minimal linux-3.13.6/fs/namei.c linux-3.13.6-vs2.3.6.11/fs/namei.c
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-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 @@
+diff -NurpP --minimal linux-3.13.10/fs/namespace.c linux-3.13.10-vs2.3.6.11/fs/namespace.c
+--- linux-3.13.10/fs/namespace.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/namespace.c 2014-04-17 01:18:37.000000000 +0000
+@@ -24,6 +24,11 @@
#include <linux/proc_ns.h>
#include <linux/magic.h>
#include <linux/bootmem.h>
@@ -4838,7 +4840,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
#include "pnode.h"
#include "internal.h"
-@@ -803,6 +808,10 @@ vfs_kern_mount(struct file_system_type *
+@@ -839,6 +844,10 @@ vfs_kern_mount(struct file_system_type *
if (!type)
return ERR_PTR(-ENODEV);
@@ -4849,7 +4851,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
mnt = alloc_vfsmnt(name);
if (!mnt)
return ERR_PTR(-ENOMEM);
-@@ -863,6 +872,7 @@ static struct mount *clone_mnt(struct mo
+@@ -899,6 +908,7 @@ static struct mount *clone_mnt(struct mo
mnt->mnt.mnt_root = dget(root);
mnt->mnt_mountpoint = mnt->mnt.mnt_root;
mnt->mnt_parent = mnt;
@@ -4857,7 +4859,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
lock_mount_hash();
list_add_tail(&mnt->mnt_instance, &sb->s_mounts);
unlock_mount_hash();
-@@ -1323,7 +1333,8 @@ static int do_umount(struct mount *mnt,
+@@ -1369,7 +1379,8 @@ static int do_umount(struct mount *mnt,
*/
static inline bool may_mount(void)
{
@@ -4867,7 +4869,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
}
/*
-@@ -1738,6 +1749,7 @@ static int do_change_type(struct path *p
+@@ -1785,6 +1796,7 @@ static int do_change_type(struct path *p
if (err)
goto out_unlock;
}
@@ -4875,7 +4877,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
lock_mount_hash();
for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL))
-@@ -1766,12 +1778,14 @@ static bool has_locked_children(struct m
+@@ -1813,12 +1825,14 @@ static bool has_locked_children(struct m
* do loopback mount.
*/
static int do_loopback(struct path *path, const char *old_name,
@@ -4891,7 +4893,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
if (!old_name || !*old_name)
return -EINVAL;
err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-@@ -1851,7 +1865,7 @@ static int change_mount_flags(struct vfs
+@@ -1898,7 +1912,7 @@ static int change_mount_flags(struct vfs
* on it - tough luck.
*/
static int do_remount(struct path *path, int flags, int mnt_flags,
@@ -4900,7 +4902,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
{
int err;
struct super_block *sb = path->mnt->mnt_sb;
-@@ -2330,6 +2344,7 @@ long do_mount(const char *dev_name, cons
+@@ -2377,6 +2391,7 @@ long do_mount(const char *dev_name, cons
struct path path;
int retval = 0;
int mnt_flags = 0;
@@ -4908,7 +4910,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
/* Discard magic */
if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-@@ -2359,6 +2374,12 @@ long do_mount(const char *dev_name, cons
+@@ -2406,6 +2421,12 @@ long do_mount(const char *dev_name, cons
if (!(flags & MS_NOATIME))
mnt_flags |= MNT_RELATIME;
@@ -4921,7 +4923,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
/* Separate the per-mountpoint flags */
if (flags & MS_NOSUID)
mnt_flags |= MNT_NOSUID;
-@@ -2375,15 +2396,17 @@ long do_mount(const char *dev_name, cons
+@@ -2422,15 +2443,17 @@ long do_mount(const char *dev_name, cons
if (flags & MS_RDONLY)
mnt_flags |= MNT_READONLY;
@@ -4941,7 +4943,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE))
retval = do_change_type(&path, flags);
else if (flags & MS_MOVE)
-@@ -2499,6 +2522,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
+@@ -2546,6 +2569,7 @@ struct mnt_namespace *copy_mnt_ns(unsign
p = next_mnt(p, old);
}
namespace_unlock();
@@ -4949,7 +4951,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
if (rootmnt)
mntput(rootmnt);
-@@ -2680,9 +2704,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
+@@ -2727,9 +2751,10 @@ SYSCALL_DEFINE2(pivot_root, const char _
new_mnt = real_mount(new.mnt);
root_mnt = real_mount(root.mnt);
old_mnt = real_mount(old.mnt);
@@ -4962,7 +4964,7 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
goto out4;
if (!check_mnt(root_mnt) || !check_mnt(new_mnt))
goto out4;
-@@ -2806,6 +2831,7 @@ void put_mnt_ns(struct mnt_namespace *ns
+@@ -2859,6 +2884,7 @@ void put_mnt_ns(struct mnt_namespace *ns
if (!atomic_dec_and_test(&ns->count))
return;
drop_collected_mounts(&ns->root->mnt);
@@ -4970,9 +4972,9 @@ diff -NurpP --minimal linux-3.13.6/fs/namespace.c linux-3.13.6-vs2.3.6.11/fs/nam
free_mnt_ns(ns);
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfs/client.c linux-3.13.10-vs2.3.6.11/fs/nfs/client.c
+--- linux-3.13.10/fs/nfs/client.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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;
@@ -4994,9 +4996,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfs/client.c linux-3.13.6-vs2.3.6.11/fs/nf
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfs/dir.c linux-3.13.10-vs2.3.6.11/fs/nfs/dir.c
+--- linux-3.13.10/fs/nfs/dir.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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>
@@ -5013,9 +5015,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfs/dir.c linux-3.13.6-vs2.3.6.11/fs/nfs/d
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfs/inode.c linux-3.13.10-vs2.3.6.11/fs/nfs/inode.c
+--- linux-3.13.10/fs/nfs/inode.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-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>
@@ -5141,9 +5143,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfs/inode.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/nfs/nfs3xdr.c linux-3.13.10-vs2.3.6.11/fs/nfs/nfs3xdr.c
+--- linux-3.13.10/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.10-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>
@@ -5289,9 +5291,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfs/nfs3xdr.c linux-3.13.6-vs2.3.6.11/fs/n
}
/*
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfs/super.c linux-3.13.10-vs2.3.6.11/fs/nfs/super.c
+--- linux-3.13.10/fs/nfs/super.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -5365,9 +5367,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfs/super.c linux-3.13.6-vs2.3.6.11/fs/nfs
/*
* options that take text values
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfsd/auth.c linux-3.13.10-vs2.3.6.11/fs/nfsd/auth.c
+--- linux-3.13.10/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/nfsd/auth.c 2014-01-31 20:38:03.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5386,9 +5388,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfsd/auth.c linux-3.13.6-vs2.3.6.11/fs/nfs
rqgi = rqstp->rq_cred.cr_group_info;
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfs3xdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs3xdr.c
+--- linux-3.13.10/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs3xdr.c 2014-01-31 20:38:03.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5442,9 +5444,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfs3xdr.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfs4xdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfs4xdr.c
+--- linux-3.13.10/fs/nfsd/nfs4xdr.c 2014-01-22 20:39:06.000000000 +0000
++++ linux-3.13.10-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>
@@ -5474,9 +5476,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfs4xdr.c linux-3.13.6-vs2.3.6.11/fs/
if (status == nfserr_resource)
goto out_resource;
if (status)
-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
+diff -NurpP --minimal linux-3.13.10/fs/nfsd/nfsxdr.c linux-3.13.10-vs2.3.6.11/fs/nfsd/nfsxdr.c
+--- linux-3.13.10/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.13.10-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"
@@ -5528,9 +5530,9 @@ diff -NurpP --minimal linux-3.13.6/fs/nfsd/nfsxdr.c linux-3.13.6-vs2.3.6.11/fs/n
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/dlmglue.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.c
+--- linux-3.13.10/fs/ocfs2/dlmglue.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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));
@@ -5547,9 +5549,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/dlmglue.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/dlmglue.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/dlmglue.h
+--- linux-3.13.10/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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;
@@ -5560,9 +5562,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/dlmglue.h linux-3.13.6-vs2.3.6.11/fs
};
#define OCFS2_QINFO_LVB_VERSION 1
-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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/file.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/file.c
+--- linux-3.13.10/fs/ocfs2/file.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/ocfs2/file.c 2014-04-17 01:17:10.000000000 +0000
@@ -1119,7 +1119,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5572,9 +5574,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/file.c linux-3.13.6-vs2.3.6.11/fs/oc
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/inode.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.c
+--- linux-3.13.10/fs/ocfs2/inode.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -5671,9 +5673,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/inode.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/inode.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/inode.h
+--- linux-3.13.10/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.13.10-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);
@@ -5682,9 +5684,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/inode.h linux-3.13.6-vs2.3.6.11/fs/o
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ioctl.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/ioctl.c
+--- linux-3.13.10/fs/ocfs2/ioctl.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.10-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;
}
@@ -5748,9 +5750,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ioctl.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/namei.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/namei.c
+--- linux-3.13.10/fs/ocfs2/namei.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -5783,9 +5785,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/namei.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ocfs2.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2.h
+--- linux-3.13.10/fs/ocfs2/ocfs2.h 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.10-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 */
@@ -5794,9 +5796,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ocfs2.h linux-3.13.6-vs2.3.6.11/fs/o
};
#define OCFS2_OSB_SOFT_RO 0x0001
-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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/ocfs2_fs.h linux-3.13.10-vs2.3.6.11/fs/ocfs2/ocfs2_fs.h
+--- linux-3.13.10/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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 */
@@ -5809,9 +5811,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/ocfs2_fs.h linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/ocfs2/super.c linux-3.13.10-vs2.3.6.11/fs/ocfs2/super.c
+--- linux-3.13.10/fs/ocfs2/super.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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,
@@ -5875,9 +5877,9 @@ diff -NurpP --minimal linux-3.13.6/fs/ocfs2/super.c linux-3.13.6-vs2.3.6.11/fs/o
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-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
+diff -NurpP --minimal linux-3.13.10/fs/open.c linux-3.13.10-vs2.3.6.11/fs/open.c
+--- linux-3.13.10/fs/open.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -5953,9 +5955,9 @@ diff -NurpP --minimal linux-3.13.6/fs/open.c linux-3.13.6-vs2.3.6.11/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/array.c linux-3.13.10-vs2.3.6.11/fs/proc/array.c
+--- linux-3.13.10/fs/proc/array.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6070,9 +6072,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/array.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/proc/base.c linux-3.13.10-vs2.3.6.11/fs/proc/base.c
+--- linux-3.13.10/fs/proc/base.c 2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/proc/base.c 2014-04-17 01:17:10.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6138,7 +6140,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
d_drop(dentry);
return 0;
}
-@@ -2172,6 +2189,13 @@ static struct dentry *proc_pident_lookup
+@@ -2173,6 +2190,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
@@ -6152,7 +6154,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2568,6 +2592,9 @@ static int proc_pid_personality(struct s
+@@ -2569,6 +2593,9 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
@@ -6162,7 +6164,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2634,6 +2661,8 @@ static const struct pid_entry tgid_base_
+@@ -2635,6 +2662,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
REG("cgroup", S_IRUGO, proc_cgroup_operations),
#endif
@@ -6171,7 +6173,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
INF("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2846,7 +2875,7 @@ retry:
+@@ -2847,7 +2876,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
@@ -6180,7 +6182,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -2899,8 +2928,10 @@ int proc_pid_readdir(struct file *file,
+@@ -2900,8 +2929,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
@@ -6192,7 +6194,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -2993,6 +3024,7 @@ static const struct pid_entry tid_base_s
+@@ -2994,6 +3025,7 @@ static const struct pid_entry tid_base_s
REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
#endif
@@ -6200,7 +6202,7 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3059,6 +3091,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3060,6 +3092,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(dentry);
if (tid == ~0U)
goto out;
@@ -6209,9 +6211,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/base.c linux-3.13.6-vs2.3.6.11/fs/pro
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/generic.c linux-3.13.10-vs2.3.6.11/fs/proc/generic.c
+--- linux-3.13.10/fs/proc/generic.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6274,9 +6276,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/generic.c linux-3.13.6-vs2.3.6.11/fs/
} else {
kfree(ent);
ent = NULL;
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/inode.c linux-3.13.10-vs2.3.6.11/fs/proc/inode.c
+--- linux-3.13.10/fs/proc/inode.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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;
@@ -6286,9 +6288,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/inode.c linux-3.13.6-vs2.3.6.11/fs/pr
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/internal.h linux-3.13.10-vs2.3.6.11/fs/proc/internal.h
+--- linux-3.13.10/fs/proc/internal.h 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.10-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>
@@ -6356,9 +6358,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/internal.h linux-3.13.6-vs2.3.6.11/fs
/*
* base.c
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/loadavg.c linux-3.13.10-vs2.3.6.11/fs/proc/loadavg.c
+--- linux-3.13.10/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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)
@@ -6388,9 +6390,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/loadavg.c linux-3.13.6-vs2.3.6.11/fs/
task_active_pid_ns(current)->last_pid);
return 0;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/meminfo.c linux-3.13.10-vs2.3.6.11/fs/proc/meminfo.c
+--- linux-3.13.10/fs/proc/meminfo.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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);
@@ -6401,9 +6403,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/meminfo.c linux-3.13.6-vs2.3.6.11/fs/
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/root.c linux-3.13.10-vs2.3.6.11/fs/proc/root.c
+--- linux-3.13.10/fs/proc/root.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.10-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>
@@ -6445,9 +6447,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/root.c linux-3.13.6-vs2.3.6.11/fs/pro
.name = "/proc",
};
-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
+diff -NurpP --minimal linux-3.13.10/fs/proc/self.c linux-3.13.10-vs2.3.6.11/fs/proc/self.c
+--- linux-3.13.10/fs/proc/self.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6465,9 +6467,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/self.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/proc/stat.c linux-3.13.10-vs2.3.6.11/fs/proc/stat.c
+--- linux-3.13.10/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.13.10-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>
@@ -6516,9 +6518,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/stat.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/proc/uptime.c linux-3.13.10-vs2.3.6.11/fs/proc/uptime.c
+--- linux-3.13.10/fs/proc/uptime.c 2013-11-25 15:45:04.000000000 +0000
++++ linux-3.13.10-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>
@@ -6538,9 +6540,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc/uptime.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/proc_namespace.c linux-3.13.10-vs2.3.6.11/fs/proc_namespace.c
+--- linux-3.13.10/fs/proc_namespace.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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" },
@@ -6654,9 +6656,9 @@ diff -NurpP --minimal linux-3.13.6/fs/proc_namespace.c linux-3.13.6-vs2.3.6.11/f
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-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
+diff -NurpP --minimal linux-3.13.10/fs/quota/dquot.c linux-3.13.10-vs2.3.6.11/fs/quota/dquot.c
+--- linux-3.13.10/fs/quota/dquot.c 2014-04-17 01:12:34.000000000 +0000
++++ linux-3.13.10-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;
@@ -6695,9 +6697,9 @@ diff -NurpP --minimal linux-3.13.6/fs/quota/dquot.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/quota/quota.c linux-3.13.10-vs2.3.6.11/fs/quota/quota.c
+--- linux-3.13.10/fs/quota/quota.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6785,9 +6787,9 @@ diff -NurpP --minimal linux-3.13.6/fs/quota/quota.c linux-3.13.6-vs2.3.6.11/fs/q
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-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
+diff -NurpP --minimal linux-3.13.10/fs/stat.c linux-3.13.10-vs2.3.6.11/fs/stat.c
+--- linux-3.13.10/fs/stat.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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;
@@ -6796,9 +6798,9 @@ diff -NurpP --minimal linux-3.13.6/fs/stat.c linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/fs/statfs.c linux-3.13.10-vs2.3.6.11/fs/statfs.c
+--- linux-3.13.10/fs/statfs.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.10-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>
@@ -6817,9 +6819,9 @@ diff -NurpP --minimal linux-3.13.6/fs/statfs.c linux-3.13.6-vs2.3.6.11/fs/statfs
return retval;
}
-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
+diff -NurpP --minimal linux-3.13.10/fs/super.c linux-3.13.10-vs2.3.6.11/fs/super.c
+--- linux-3.13.10/fs/super.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6843,9 +6845,9 @@ diff -NurpP --minimal linux-3.13.6/fs/super.c linux-3.13.6-vs2.3.6.11/fs/super.c
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-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
+diff -NurpP --minimal linux-3.13.10/fs/sysfs/mount.c linux-3.13.10-vs2.3.6.11/fs/sysfs/mount.c
+--- linux-3.13.10/fs/sysfs/mount.c 2013-11-25 15:47:00.000000000 +0000
++++ linux-3.13.10-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;
@@ -6855,9 +6857,9 @@ diff -NurpP --minimal linux-3.13.6/fs/sysfs/mount.c linux-3.13.6-vs2.3.6.11/fs/s
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-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
+diff -NurpP --minimal linux-3.13.10/fs/utimes.c linux-3.13.10-vs2.3.6.11/fs/utimes.c
+--- linux-3.13.10/fs/utimes.c 2014-01-22 20:39:07.000000000 +0000
++++ linux-3.13.10-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>
@@ -6888,9 +6890,9 @@ diff -NurpP --minimal linux-3.13.6/fs/utimes.c linux-3.13.6-vs2.3.6.11/fs/utimes
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-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
+diff -NurpP --minimal linux-3.13.10/fs/xattr.c linux-3.13.10-vs2.3.6.11/fs/xattr.c
+--- linux-3.13.10/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.13.10-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>
@@ -6908,9 +6910,9 @@ diff -NurpP --minimal linux-3.13.6/fs/xattr.c linux-3.13.6-vs2.3.6.11/fs/xattr.c
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/cred.h linux-3.13.10-vs2.3.6.11/include/linux/cred.h
+--- linux-3.13.10/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.13.10-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 *);
@@ -6951,18 +6953,18 @@ diff -NurpP --minimal linux-3.13.6/include/linux/cred.h linux-3.13.6-vs2.3.6.11/
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/devpts_fs.h linux-3.13.10-vs2.3.6.11/include/linux/devpts_fs.h
+--- linux-3.13.10/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.13.10-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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/fs.h linux-3.13.10-vs2.3.6.11/include/linux/fs.h
+--- linux-3.13.10/include/linux/fs.h 2014-01-22 20:39:10.000000000 +0000
++++ linux-3.13.10-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) */
@@ -7128,9 +7130,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/fs.h linux-3.13.6-vs2.3.6.11/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/init_task.h linux-3.13.10-vs2.3.6.11/include/linux/init_task.h
+--- linux-3.13.10/include/linux/init_task.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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) \
@@ -7142,9 +7144,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/init_task.h linux-3.13.6-vs2.3.
}
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/ipc.h linux-3.13.10-vs2.3.6.11/include/linux/ipc.h
+--- linux-3.13.10/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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;
@@ -7153,9 +7155,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/ipc.h linux-3.13.6-vs2.3.6.11/i
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/memcontrol.h linux-3.13.10-vs2.3.6.11/include/linux/memcontrol.h
+--- linux-3.13.10/include/linux/memcontrol.h 2013-11-25 15:47:01.000000000 +0000
++++ linux-3.13.10-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);
@@ -7170,9 +7172,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/memcontrol.h linux-3.13.6-vs2.3
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/mm_types.h linux-3.13.10-vs2.3.6.11/include/linux/mm_types.h
+--- linux-3.13.10/include/linux/mm_types.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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 */
@@ -7181,9 +7183,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/mm_types.h linux-3.13.6-vs2.3.6
unsigned long flags; /* Must use atomic bitops to access the bits */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/mount.h linux-3.13.10-vs2.3.6.11/include/linux/mount.h
+--- linux-3.13.10/include/linux/mount.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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
@@ -7194,9 +7196,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/mount.h linux-3.13.6-vs2.3.6.11
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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/net.h linux-3.13.10-vs2.3.6.11/include/linux/net.h
+--- linux-3.13.10/include/linux/net.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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
@@ -7205,9 +7207,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/net.h linux-3.13.6-vs2.3.6.11/i
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/netdevice.h linux-3.13.10-vs2.3.6.11/include/linux/netdevice.h
+--- linux-3.13.10/include/linux/netdevice.h 2014-04-17 01:12:37.000000000 +0000
++++ linux-3.13.10-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);
@@ -7216,9 +7218,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/netdevice.h linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/nsproxy.h linux-3.13.10-vs2.3.6.11/include/linux/nsproxy.h
+--- linux-3.13.10/include/linux/nsproxy.h 2013-11-25 15:45:06.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/nsproxy.h 2014-01-31 20:38:03.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -7268,9 +7270,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/nsproxy.h linux-3.13.6-vs2.3.6.
}
#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/pid.h linux-3.13.10-vs2.3.6.11/include/linux/pid.h
+--- linux-3.13.10/include/linux/pid.h 2013-11-25 15:45:06.000000000 +0000
++++ linux-3.13.10-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,
@@ -7289,9 +7291,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/pid.h linux-3.13.6-vs2.3.6.11/i
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/quotaops.h linux-3.13.10-vs2.3.6.11/include/linux/quotaops.h
+--- linux-3.13.10/include/linux/quotaops.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/quotaops.h 2014-01-31 20:38:03.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -7333,9 +7335,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/quotaops.h linux-3.13.6-vs2.3.6
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/sched.h linux-3.13.10-vs2.3.6.11/include/linux/sched.h
+--- linux-3.13.10/include/linux/sched.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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;
@@ -7382,9 +7384,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/sched.h linux-3.13.6-vs2.3.6.11
}
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/shmem_fs.h linux-3.13.10-vs2.3.6.11/include/linux/shmem_fs.h
+--- linux-3.13.10/include/linux/shmem_fs.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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 */
@@ -7395,9 +7397,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/shmem_fs.h linux-3.13.6-vs2.3.6
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/stat.h linux-3.13.10-vs2.3.6.11/include/linux/stat.h
+--- linux-3.13.10/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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;
@@ -7406,9 +7408,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/stat.h linux-3.13.6-vs2.3.6.11/
dev_t rdev;
loff_t size;
struct timespec atime;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/sunrpc/auth.h linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/auth.h
+--- linux-3.13.10/include/linux/sunrpc/auth.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-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;
@@ -7417,9 +7419,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/sunrpc/auth.h linux-3.13.6-vs2.
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/sunrpc/clnt.h linux-3.13.10-vs2.3.6.11/include/linux/sunrpc/clnt.h
+--- linux-3.13.10/include/linux/sunrpc/clnt.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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 */
@@ -7430,9 +7432,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/sunrpc/clnt.h linux-3.13.6-vs2.
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/sysfs.h linux-3.13.10-vs2.3.6.11/include/linux/sysfs.h
+--- linux-3.13.10/include/linux/sysfs.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-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>
@@ -7442,9 +7444,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/sysfs.h linux-3.13.6-vs2.3.6.11
struct kobject;
struct module;
struct bin_attribute;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/types.h linux-3.13.10-vs2.3.6.11/include/linux/types.h
+--- linux-3.13.10/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.13.10-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;
@@ -7455,9 +7457,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/types.h linux-3.13.6-vs2.3.6.11
typedef unsigned long uintptr_t;
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/uidgid.h linux-3.13.10-vs2.3.6.11/include/linux/uidgid.h
+--- linux-3.13.10/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-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;
@@ -7577,9 +7579,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/uidgid.h linux-3.13.6-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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vroot.h linux-3.13.10-vs2.3.6.11/include/linux/vroot.h
+--- linux-3.13.10/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vroot.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -7632,9 +7634,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vroot.h linux-3.13.6-vs2.3.6.11
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_base.h linux-3.13.10-vs2.3.6.11/include/linux/vs_base.h
+--- linux-3.13.10/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -7646,9 +7648,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_base.h linux-3.13.6-vs2.3.6.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_context.h linux-3.13.10-vs2.3.6.11/include/linux/vs_context.h
+--- linux-3.13.10/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -7892,9 +7894,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_context.h linux-3.13.6-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_cowbl.h linux-3.13.10-vs2.3.6.11/include/linux/vs_cowbl.h
+--- linux-3.13.10/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -7944,9 +7946,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_cowbl.h linux-3.13.6-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_cvirt.h linux-3.13.10-vs2.3.6.11/include/linux/vs_cvirt.h
+--- linux-3.13.10/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -7998,9 +8000,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_cvirt.h linux-3.13.6-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_device.h linux-3.13.10-vs2.3.6.11/include/linux/vs_device.h
+--- linux-3.13.10/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -8047,9 +8049,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_device.h linux-3.13.6-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_dlimit.h linux-3.13.10-vs2.3.6.11/include/linux/vs_dlimit.h
+--- linux-3.13.10/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -8266,9 +8268,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_dlimit.h linux-3.13.6-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_inet.h linux-3.13.10-vs2.3.6.11/include/linux/vs_inet.h
+--- linux-3.13.10/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -8634,9 +8636,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_inet.h linux-3.13.6-vs2.3.6.
+#else
+// #warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_inet6.h linux-3.13.10-vs2.3.6.11/include/linux/vs_inet6.h
+--- linux-3.13.10/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -8895,9 +8897,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_inet6.h linux-3.13.6-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_limit.h linux-3.13.10-vs2.3.6.11/include/linux/vs_limit.h
+--- linux-3.13.10/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9039,9 +9041,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_limit.h linux-3.13.6-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_network.h linux-3.13.10-vs2.3.6.11/include/linux/vs_network.h
+--- linux-3.13.10/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9212,9 +9214,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_network.h linux-3.13.6-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_pid.h linux-3.13.10-vs2.3.6.11/include/linux/vs_pid.h
+--- linux-3.13.10/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9266,9 +9268,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_pid.h linux-3.13.6-vs2.3.6.1
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_sched.h linux-3.13.10-vs2.3.6.11/include/linux/vs_sched.h
+--- linux-3.13.10/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9310,9 +9312,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_sched.h linux-3.13.6-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_socket.h linux-3.13.10-vs2.3.6.11/include/linux/vs_socket.h
+--- linux-3.13.10/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9381,9 +9383,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_socket.h linux-3.13.6-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_tag.h linux-3.13.10-vs2.3.6.11/include/linux/vs_tag.h
+--- linux-3.13.10/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9432,9 +9434,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_tag.h linux-3.13.6-vs2.3.6.1
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vs_time.h linux-3.13.10-vs2.3.6.11/include/linux/vs_time.h
+--- linux-3.13.10/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9455,9 +9457,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vs_time.h linux-3.13.6-vs2.3.6.
+#else
+#warning duplicate inclusion
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/base.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/base.h
+--- linux-3.13.10/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9643,9 +9645,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/base.h linux-3.13.6-vs2
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct.h
+--- linux-3.13.10/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9662,9 +9664,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct.h linux-3.13.6-vs
+};
+
+#endif /* _VSERVER_CACCT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_cmd.h
+--- linux-3.13.10/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9676,9 +9678,9 @@ diff -NurpP --minimal linux-3.13.6/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_def.h
+--- linux-3.13.10/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9723,9 +9725,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cacct_int.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cacct_int.h
+--- linux-3.13.10/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9744,9 +9746,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cacct_int.h linux-3.13.
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/check.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/check.h
+--- linux-3.13.10/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9837,9 +9839,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/check.h linux-3.13.6-vs
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/context.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/context.h
+--- linux-3.13.10/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9951,9 +9953,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/context.h linux-3.13.6-
+
+
+#endif /* _VSERVER_CONTEXT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/context_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/context_cmd.h
+--- linux-3.13.10/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -9988,9 +9990,9 @@ diff -NurpP --minimal linux-3.13.6/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt.h
+--- linux-3.13.10/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10010,9 +10012,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cvirt.h linux-3.13.6-vs
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_cmd.h
+--- linux-3.13.10/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10027,9 +10029,9 @@ diff -NurpP --minimal linux-3.13.6/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/cvirt_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/cvirt_def.h
+--- linux-3.13.10/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10111,9 +10113,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/cvirt_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/debug.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug.h
+--- linux-3.13.10/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10261,9 +10263,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/debug.h linux-3.13.6-vs
+
+
+#endif /* _VSERVER_DEBUG_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/debug_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/debug_cmd.h
+--- linux-3.13.10/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10302,9 +10304,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/debug_cmd.h linux-3.13.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device.h
+--- linux-3.13.10/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10315,9 +10317,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device.h linux-3.13.6-v
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_cmd.h
+--- linux-3.13.10/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10350,9 +10352,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device_cmd.h linux-3.13
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/device_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/device_def.h
+--- linux-3.13.10/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10371,9 +10373,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/device_def.h linux-3.13
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/dlimit.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit.h
+--- linux-3.13.10/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10429,9 +10431,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/dlimit.h linux-3.13.6-v
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/dlimit_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/dlimit_cmd.h
+--- linux-3.13.10/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10479,9 +10481,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/dlimit_cmd.h linux-3.13
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/global.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/global.h
+--- linux-3.13.10/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10502,9 +10504,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/global.h linux-3.13.6-v
+
+
+#endif /* _VSERVER_GLOBAL_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/history.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/history.h
+--- linux-3.13.10/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10703,9 +10705,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/history.h linux-3.13.6-
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/inode.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode.h
+--- linux-3.13.10/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10726,9 +10728,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/inode.h linux-3.13.6-vs
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/inode_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/inode_cmd.h
+--- linux-3.13.10/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10766,9 +10768,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/inode_cmd.h linux-3.13.
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit.h
+--- linux-3.13.10/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10831,9 +10833,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit.h linux-3.13.6-vs
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_cmd.h
+--- linux-3.13.10/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10870,9 +10872,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_cmd.h linux-3.13.
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_def.h
+--- linux-3.13.10/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -10921,9 +10923,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/limit_int.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/limit_int.h
+--- linux-3.13.10/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11118,9 +11120,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/limit_int.h linux-3.13.
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/monitor.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/monitor.h
+--- linux-3.13.10/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11128,9 +11130,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/monitor.h linux-3.13.6-
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/network.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/network.h
+--- linux-3.13.10/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11208,9 +11210,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/network.h linux-3.13.6-
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/network_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/network_cmd.h
+--- linux-3.13.10/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11249,9 +11251,9 @@ diff -NurpP --minimal linux-3.13.6/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/percpu.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/percpu.h
+--- linux-3.13.10/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11267,9 +11269,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/percpu.h linux-3.13.6-v
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/pid.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/pid.h
+--- linux-3.13.10/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11322,9 +11324,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/pid.h linux-3.13.6-vs2.
+}
+
+#endif
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched.h
+--- linux-3.13.10/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11349,9 +11351,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/sched.h linux-3.13.6-vs
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_cmd.h
+--- linux-3.13.10/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11364,9 +11366,9 @@ diff -NurpP --minimal linux-3.13.6/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.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
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/sched_def.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/sched_def.h
+--- linux-3.13.10/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-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
@@ -11406,9 +11408,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/sched_def.h linux-3.13.
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/signal.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/signal.h
---- linux-3.13.6/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/signal.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/signal.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal.h
+--- linux-3.13.10/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
@@ -11424,9 +11426,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/signal.h linux-3.13.6-v
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/signal_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/signal_cmd.h
---- linux-3.13.6/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/signal_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal_cmd.h
+--- linux-3.13.10/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
@@ -11442,9 +11444,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/signal_cmd.h linux-3.13
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/space.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/space.h
---- linux-3.13.6/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/space.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/space.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/space.h
+--- linux-3.13.10/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/space.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
@@ -11458,9 +11460,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/space.h linux-3.13.6-vs
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/space_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/space_cmd.h
---- linux-3.13.6/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/space_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/space_cmd.h
+--- linux-3.13.10/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
@@ -11475,9 +11477,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/space_cmd.h linux-3.13.
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/switch.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/switch.h
---- linux-3.13.6/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/switch.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/switch.h
+--- linux-3.13.10/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
@@ -11487,9 +11489,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/switch.h linux-3.13.6-v
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/tag.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/tag.h
---- linux-3.13.6/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/tag.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/tag.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag.h
+--- linux-3.13.10/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -11651,9 +11653,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/tag.h linux-3.13.6-vs2.
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.13.6/include/linux/vserver/tag_cmd.h linux-3.13.6-vs2.3.6.11/include/linux/vserver/tag_cmd.h
---- linux-3.13.6/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/linux/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/linux/vserver/tag_cmd.h linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag_cmd.h
+--- linux-3.13.10/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/linux/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
@@ -11665,9 +11667,9 @@ diff -NurpP --minimal linux-3.13.6/include/linux/vserver/tag_cmd.h linux-3.13.6-
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/net/addrconf.h linux-3.13.6-vs2.3.6.11/include/net/addrconf.h
---- linux-3.13.6/include/net/addrconf.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/addrconf.h 2014-01-31 20:39:35.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/addrconf.h linux-3.13.10-vs2.3.6.11/include/net/addrconf.h
+--- linux-3.13.10/include/net/addrconf.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/addrconf.h 2014-01-31 20:39:35.000000000 +0000
@@ -79,7 +79,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
@@ -11677,9 +11679,9 @@ diff -NurpP --minimal linux-3.13.6/include/net/addrconf.h linux-3.13.6-vs2.3.6.1
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
unsigned char banned_flags);
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
-diff -NurpP --minimal linux-3.13.6/include/net/af_unix.h linux-3.13.6-vs2.3.6.11/include/net/af_unix.h
---- linux-3.13.6/include/net/af_unix.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/af_unix.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/af_unix.h linux-3.13.10-vs2.3.6.11/include/net/af_unix.h
+--- linux-3.13.10/include/net/af_unix.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/af_unix.h 2014-01-31 20:38:03.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -11688,9 +11690,9 @@ diff -NurpP --minimal linux-3.13.6/include/net/af_unix.h linux-3.13.6-vs2.3.6.11
#include <net/sock.h>
void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.13.6/include/net/inet_timewait_sock.h linux-3.13.6-vs2.3.6.11/include/net/inet_timewait_sock.h
---- linux-3.13.6/include/net/inet_timewait_sock.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/inet_timewait_sock.h 2014-01-31 20:40:30.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/inet_timewait_sock.h linux-3.13.10-vs2.3.6.11/include/net/inet_timewait_sock.h
+--- linux-3.13.10/include/net/inet_timewait_sock.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/inet_timewait_sock.h 2014-01-31 20:40:30.000000000 +0000
@@ -121,6 +121,10 @@ struct inet_timewait_sock {
#define tw_v6_rcv_saddr __tw_common.skc_v6_rcv_saddr
#define tw_dport __tw_common.skc_dport
@@ -11702,9 +11704,9 @@ diff -NurpP --minimal linux-3.13.6/include/net/inet_timewait_sock.h linux-3.13.6
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-3.13.6/include/net/ip6_route.h linux-3.13.6-vs2.3.6.11/include/net/ip6_route.h
---- linux-3.13.6/include/net/ip6_route.h 2014-01-22 20:39:11.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/ip6_route.h 2014-01-31 20:41:10.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/ip6_route.h linux-3.13.10-vs2.3.6.11/include/net/ip6_route.h
+--- linux-3.13.10/include/net/ip6_route.h 2014-01-22 20:39:11.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/ip6_route.h 2014-01-31 20:41:10.000000000 +0000
@@ -90,7 +90,7 @@ int ip6_del_rt(struct rt6_info *);
int ip6_route_get_saddr(struct net *net, struct rt6_info *rt,
@@ -11714,9 +11716,9 @@ diff -NurpP --minimal linux-3.13.6/include/net/ip6_route.h linux-3.13.6-vs2.3.6.
struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
const struct in6_addr *saddr, int oif, int flags);
-diff -NurpP --minimal linux-3.13.6/include/net/route.h linux-3.13.6-vs2.3.6.11/include/net/route.h
---- linux-3.13.6/include/net/route.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/route.h 2014-02-01 12:30:58.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/route.h linux-3.13.10-vs2.3.6.11/include/net/route.h
+--- linux-3.13.10/include/net/route.h 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/route.h 2014-02-01 12:30:58.000000000 +0000
@@ -203,6 +203,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
@@ -11764,9 +11766,9 @@ diff -NurpP --minimal linux-3.13.6/include/net/route.h linux-3.13.6-vs2.3.6.11/i
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.13.6/include/net/sock.h linux-3.13.6-vs2.3.6.11/include/net/sock.h
---- linux-3.13.6/include/net/sock.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/net/sock.h 2014-01-31 20:42:22.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/net/sock.h linux-3.13.10-vs2.3.6.11/include/net/sock.h
+--- linux-3.13.10/include/net/sock.h 2014-04-17 01:12:39.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/net/sock.h 2014-04-17 01:17:10.000000000 +0000
@@ -191,6 +191,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
@@ -11791,17 +11793,17 @@ diff -NurpP --minimal linux-3.13.6/include/net/sock.h linux-3.13.6-vs2.3.6.11/in
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
-diff -NurpP --minimal linux-3.13.6/include/uapi/Kbuild linux-3.13.6-vs2.3.6.11/include/uapi/Kbuild
---- linux-3.13.6/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/Kbuild 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/Kbuild linux-3.13.10-vs2.3.6.11/include/uapi/Kbuild
+--- linux-3.13.10/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/Kbuild 2014-01-31 20:38:03.000000000 +0000
@@ -12,3 +12,4 @@ header-y += video/
header-y += drm/
header-y += xen/
header-y += scsi/
+header-y += vserver/
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/capability.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/capability.h
---- linux-3.13.6/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/capability.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/capability.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/capability.h
+--- linux-3.13.10/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/capability.h 2014-01-31 20:38:03.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -11824,9 +11826,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/capability.h linux-3.13.6-
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/fs.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/fs.h
---- linux-3.13.6/include/uapi/linux/fs.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/fs.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/fs.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/fs.h
+--- linux-3.13.10/include/uapi/linux/fs.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/fs.h 2014-01-31 20:38:03.000000000 +0000
@@ -86,6 +86,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
@@ -11854,9 +11856,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/fs.h linux-3.13.6-vs2.3.6.
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/gfs2_ondisk.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h
---- linux-3.13.6/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/gfs2_ondisk.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.13.10/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/gfs2_ondisk.h 2014-01-31 20:38:03.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
@@ -11877,9 +11879,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/gfs2_ondisk.h linux-3.13.6
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/if_tun.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/if_tun.h
---- linux-3.13.6/include/uapi/linux/if_tun.h 2013-11-25 15:47:02.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/if_tun.h 2014-01-31 20:45:49.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/if_tun.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/if_tun.h
+--- linux-3.13.10/include/uapi/linux/if_tun.h 2013-11-25 15:47:02.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/if_tun.h 2014-01-31 20:45:49.000000000 +0000
@@ -58,6 +58,7 @@
#define TUNSETQUEUE _IOW('T', 217, int)
#define TUNSETIFINDEX _IOW('T', 218, unsigned int)
@@ -11888,9 +11890,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/if_tun.h linux-3.13.6-vs2.
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/major.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/major.h
---- linux-3.13.6/include/uapi/linux/major.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/major.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/major.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/major.h
+--- linux-3.13.10/include/uapi/linux/major.h 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/major.h 2014-01-31 20:38:03.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -11899,9 +11901,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/major.h linux-3.13.6-vs2.3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/nfs_mount.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/nfs_mount.h
---- linux-3.13.6/include/uapi/linux/nfs_mount.h 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/nfs_mount.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/nfs_mount.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/nfs_mount.h
+--- linux-3.13.10/include/uapi/linux/nfs_mount.h 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/nfs_mount.h 2014-01-31 20:38:03.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -11912,9 +11914,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/nfs_mount.h linux-3.13.6-v
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/reboot.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/reboot.h
---- linux-3.13.6/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/reboot.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/reboot.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/reboot.h
+--- linux-3.13.10/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/reboot.h 2014-01-31 20:38:03.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -11924,9 +11926,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/reboot.h linux-3.13.6-vs2.
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/linux/sysctl.h linux-3.13.6-vs2.3.6.11/include/uapi/linux/sysctl.h
---- linux-3.13.6/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/linux/sysctl.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/linux/sysctl.h linux-3.13.10-vs2.3.6.11/include/uapi/linux/sysctl.h
+--- linux-3.13.10/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/linux/sysctl.h 2014-01-31 20:38:03.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -11943,9 +11945,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/linux/sysctl.h linux-3.13.6-vs2.
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/Kbuild linux-3.13.6-vs2.3.6.11/include/uapi/vserver/Kbuild
---- linux-3.13.6/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/Kbuild 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/Kbuild linux-3.13.10-vs2.3.6.11/include/uapi/vserver/Kbuild
+--- linux-3.13.10/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/Kbuild 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -11956,9 +11958,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/Kbuild linux-3.13.6-vs2.
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/cacct_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h
---- linux-3.13.6/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/cacct_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h
+--- linux-3.13.10/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cacct_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
@@ -11975,9 +11977,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/cacct_cmd.h linux-3.13.6
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/context.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/context.h
---- linux-3.13.6/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/context.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context.h
+--- linux-3.13.10/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
@@ -12060,9 +12062,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/context.h linux-3.13.6-v
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/context_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/context_cmd.h
---- linux-3.13.6/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/context_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context_cmd.h
+--- linux-3.13.10/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/context_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
@@ -12179,9 +12181,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/context_cmd.h linux-3.13
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/cvirt_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h
---- linux-3.13.6/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/cvirt_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.13.10/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/cvirt_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
@@ -12224,9 +12226,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/cvirt_cmd.h linux-3.13.6
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/debug_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/debug_cmd.h
---- linux-3.13.6/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/debug_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/debug_cmd.h
+--- linux-3.13.10/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/debug_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
@@ -12252,9 +12254,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/debug_cmd.h linux-3.13.6
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/device.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/device.h
---- linux-3.13.6/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/device.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device.h
+--- linux-3.13.10/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
@@ -12268,9 +12270,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/device.h linux-3.13.6-vs
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/device_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/device_cmd.h
---- linux-3.13.6/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/device_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device_cmd.h
+--- linux-3.13.10/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/device_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
@@ -12288,9 +12290,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/device_cmd.h linux-3.13.
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/dlimit_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h
---- linux-3.13.6/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/dlimit_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.13.10/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/dlimit_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
@@ -12359,9 +12361,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/dlimit_cmd.h linux-3.13.
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/inode.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/inode.h
---- linux-3.13.6/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/inode.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode.h
+--- linux-3.13.10/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
@@ -12386,9 +12388,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/inode.h linux-3.13.6-vs2
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/inode_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/inode_cmd.h
---- linux-3.13.6/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/inode_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode_cmd.h
+--- linux-3.13.10/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/inode_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
@@ -12416,9 +12418,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/inode_cmd.h linux-3.13.6
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/limit.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/limit.h
---- linux-3.13.6/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/limit.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit.h
+--- linux-3.13.10/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
@@ -12434,9 +12436,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/limit.h linux-3.13.6-vs2
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/limit_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/limit_cmd.h
---- linux-3.13.6/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/limit_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit_cmd.h
+--- linux-3.13.10/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/limit_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
@@ -12478,9 +12480,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/limit_cmd.h linux-3.13.6
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/monitor.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/monitor.h
---- linux-3.13.6/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/monitor.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/monitor.h
+--- linux-3.13.10/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/monitor.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
@@ -12578,9 +12580,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/monitor.h linux-3.13.6-v
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/network.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/network.h
---- linux-3.13.6/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/network.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network.h
+--- linux-3.13.10/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
@@ -12658,9 +12660,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/network.h linux-3.13.6-v
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/network_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/network_cmd.h
---- linux-3.13.6/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/network_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network_cmd.h
+--- linux-3.13.10/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/network_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
@@ -12785,9 +12787,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/network_cmd.h linux-3.13
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/sched_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/sched_cmd.h
---- linux-3.13.6/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/sched_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/sched_cmd.h
+--- linux-3.13.10/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/sched_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
@@ -12802,9 +12804,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/sched_cmd.h linux-3.13.6
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/signal_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/signal_cmd.h
---- linux-3.13.6/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/signal_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/signal_cmd.h
+--- linux-3.13.10/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/signal_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
@@ -12837,9 +12839,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/signal_cmd.h linux-3.13.
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/space_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/space_cmd.h
---- linux-3.13.6/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/space_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/space_cmd.h
+--- linux-3.13.10/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/space_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
@@ -12869,9 +12871,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/space_cmd.h linux-3.13.6
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/switch.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/switch.h
---- linux-3.13.6/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/switch.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/switch.h
+--- linux-3.13.10/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/switch.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
@@ -12963,9 +12965,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/switch.h linux-3.13.6-vs
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/tag_cmd.h linux-3.13.6-vs2.3.6.11/include/uapi/vserver/tag_cmd.h
---- linux-3.13.6/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/include/uapi/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/include/uapi/vserver/tag_cmd.h linux-3.13.10-vs2.3.6.11/include/uapi/vserver/tag_cmd.h
+--- linux-3.13.10/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/include/uapi/vserver/tag_cmd.h 2014-01-31 20:38:03.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
@@ -12981,9 +12983,9 @@ diff -NurpP --minimal linux-3.13.6/include/uapi/vserver/tag_cmd.h linux-3.13.6-v
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-3.13.6/init/Kconfig linux-3.13.6-vs2.3.6.11/init/Kconfig
---- linux-3.13.6/init/Kconfig 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/init/Kconfig 2014-01-31 21:05:27.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/init/Kconfig linux-3.13.10-vs2.3.6.11/init/Kconfig
+--- linux-3.13.10/init/Kconfig 2014-04-17 01:12:39.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/init/Kconfig 2014-04-17 01:17:11.000000000 +0000
@@ -855,6 +855,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
@@ -13000,9 +13002,9 @@ diff -NurpP --minimal linux-3.13.6/init/Kconfig linux-3.13.6-vs2.3.6.11/init/Kco
default n
help
-diff -NurpP --minimal linux-3.13.6/init/main.c linux-3.13.6-vs2.3.6.11/init/main.c
---- linux-3.13.6/init/main.c 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/init/main.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/init/main.c linux-3.13.10-vs2.3.6.11/init/main.c
+--- linux-3.13.10/init/main.c 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/init/main.c 2014-01-31 20:38:03.000000000 +0000
@@ -77,6 +77,7 @@
#include <linux/sched_clock.h>
#include <linux/context_tracking.h>
@@ -13011,9 +13013,9 @@ diff -NurpP --minimal linux-3.13.6/init/main.c linux-3.13.6-vs2.3.6.11/init/main
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.13.6/ipc/mqueue.c linux-3.13.6-vs2.3.6.11/ipc/mqueue.c
---- linux-3.13.6/ipc/mqueue.c 2014-03-12 13:51:24.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/ipc/mqueue.c 2014-03-12 15:51:08.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/ipc/mqueue.c linux-3.13.10-vs2.3.6.11/ipc/mqueue.c
+--- linux-3.13.10/ipc/mqueue.c 2014-04-17 01:12:39.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/ipc/mqueue.c 2014-03-12 15:51:08.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
@@ -13089,9 +13091,9 @@ diff -NurpP --minimal linux-3.13.6/ipc/mqueue.c linux-3.13.6-vs2.3.6.11/ipc/mque
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.13.6/ipc/msg.c linux-3.13.6-vs2.3.6.11/ipc/msg.c
---- linux-3.13.6/ipc/msg.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/ipc/msg.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/ipc/msg.c linux-3.13.10-vs2.3.6.11/ipc/msg.c
+--- linux-3.13.10/ipc/msg.c 2014-04-17 01:12:39.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/ipc/msg.c 2014-04-17 01:17:11.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13108,9 +13110,9 @@ diff -NurpP --minimal linux-3.13.6/ipc/msg.c linux-3.13.6-vs2.3.6.11/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.13.6/ipc/sem.c linux-3.13.6-vs2.3.6.11/ipc/sem.c
---- linux-3.13.6/ipc/sem.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/ipc/sem.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/ipc/sem.c linux-3.13.10-vs2.3.6.11/ipc/sem.c
+--- linux-3.13.10/ipc/sem.c 2013-11-25 15:47:03.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/ipc/sem.c 2014-01-31 20:38:03.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13148,9 +13150,9 @@ diff -NurpP --minimal linux-3.13.6/ipc/sem.c linux-3.13.6-vs2.3.6.11/ipc/sem.c
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-3.13.6/ipc/shm.c linux-3.13.6-vs2.3.6.11/ipc/shm.c
---- linux-3.13.6/ipc/shm.c 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/ipc/shm.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/ipc/shm.c linux-3.13.10-vs2.3.6.11/ipc/shm.c
+--- linux-3.13.10/ipc/shm.c 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/ipc/shm.c 2014-01-31 20:38:03.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -13208,9 +13210,9 @@ diff -NurpP --minimal linux-3.13.6/ipc/shm.c linux-3.13.6-vs2.3.6.11/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.13.6/kernel/Makefile linux-3.13.6-vs2.3.6.11/kernel/Makefile
---- linux-3.13.6/kernel/Makefile 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/kernel/Makefile 2014-01-31 21:36:22.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/kernel/Makefile linux-3.13.10-vs2.3.6.11/kernel/Makefile
+--- linux-3.13.10/kernel/Makefile 2014-01-22 20:39:12.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/kernel/Makefile 2014-01-31 21:36:22.000000000 +0000
@@ -25,6 +25,7 @@ obj-y += printk/
obj-y += cpu/
obj-y += irq/
@@ -13219,9 +13221,9 @@ diff -NurpP --minimal linux-3.13.6/kernel/Makefile linux-3.13.6-vs2.3.6.11/kerne
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-3.13.6/kernel/auditsc.c linux-3.13.6-vs2.3.6.11/kernel/auditsc.c
---- linux-3.13.6/kernel/auditsc.c 2014-01-22 20:39:12.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/kernel/auditsc.c 2014-01-31 21:07:11.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/kernel/auditsc.c linux-3.13.10-vs2.3.6.11/kernel/auditsc.c
+--- linux-3.13.10/kernel/auditsc.c 2014-04-17 01:12:39.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/kernel/auditsc.c 2014-04-17 01:17:11.000000000 +0000
@@ -1956,7 +1956,7 @@ static int audit_set_loginuid_perm(kuid_
if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
return -EPERM;
@@ -13231,9 +13233,9 @@ diff -NurpP --minimal linux-3.13.6/kernel/auditsc.c linux-3.13.6-vs2.3.6.11/kern
return -EPERM;
/* reject if this is not an unset and we don't allow that */
if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid))
-diff -NurpP --minimal linux-3.13.6/kernel/capability.c linux-3.13.6-vs2.3.6.11/kernel/capability.c
---- linux-3.13.6/kernel/capability.c 2013-11-25 15:47:03.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/kernel/capability.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/kernel/capability.c linux-3.13.10-vs2.3.6.11/kernel/capability.c
+--- linux-3.13.10/kernel/capability.c 2013-11-25 15:47:03.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/kernel/capability.c 2014-01-31 20:38:03.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -13259,9 +13261,9 @@ diff -NurpP --minimal linux-3.13.6/kernel/capability.c linux-3.13.6-vs2.3.6.11/k
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.13.6/kernel/compat.c linux-3.13.6-vs2.3.6.11/kernel/compat.c
---- linux-3.13.6/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/kernel/compat.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/kernel/compat.c linux-3.13.10-vs2.3.6.11/kernel/compat.c
+--- linux-3.13.10/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/kernel/compat.c 2014-01-31 20:38:03.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
@@ -13279,9 +13281,9 @@ diff -NurpP --minimal linux-3.13.6/kernel/compat.c linux-3.13.6-vs2.3.6.11/kerne
return 0;
}
-diff -NurpP --minimal linux-3.13.6/kernel/cred.c linux-3.13.6-vs2.3.6.11/kernel/cred.c
---- linux-3.13.6/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
-+++ linux-3.13.6-vs2.3.6.11/kernel/cred.c 2014-01-31 20:38:03.000000000 +0000
+diff -NurpP --minimal linux-3.13.10/kernel/cred.c linux-3.13.10-vs2.3.6.11/kernel/cred.c
+--- linux-3.13.10/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/kernel/cred.c 2014-01-31 20:38:03.000000000 +0000
@@ -56,31 +56,6 @@ struct cred init_cred = {
<Skipped 1563 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/978063ceda831ec9e43dbd332fb4804dd81021fd
More information about the pld-cvs-commit
mailing list