From: Arkadiusz Miśkiewicz Date: Thu, 22 Feb 2018 23:47:42 +0000 (+0100) Subject: - up to 4.4.117; vserver up to 4.4.115-vs2.3.9.7 X-Git-Tag: auto/th/kernel-4.4-4.4.117-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=0e1bbc97492d4ac3f0fc3a79946e2274f40c58b9;p=packages%2Fkernel.git - up to 4.4.117; vserver up to 4.4.115-vs2.3.9.7 --- diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 5428a99a..95359eb1 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-4.4.113/Documentation/vserver/debug.txt linux-4.4.113-vs2.3.9.6/Documentation/vserver/debug.txt ---- linux-4.4.113/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/Documentation/vserver/debug.txt linux-4.4.115-vs2.3.9.7/Documentation/vserver/debug.txt +--- linux-4.4.115/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -156,9 +156,9 @@ diff -NurpP --minimal linux-4.4.113/Documentation/vserver/debug.txt linux-4.4.11 + 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-4.4.113/arch/alpha/Kconfig linux-4.4.113-vs2.3.9.6/arch/alpha/Kconfig ---- linux-4.4.113/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/alpha/Kconfig linux-4.4.115-vs2.3.9.7/arch/alpha/Kconfig +--- linux-4.4.115/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000 @@ -745,6 +745,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-4.4.113/arch/alpha/Kconfig linux-4.4.113-vs2.3.9.6/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/systbls.S linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/systbls.S ---- linux-4.4.113/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/alpha/kernel/systbls.S linux-4.4.115-vs2.3.9.7/arch/alpha/kernel/systbls.S +--- linux-4.4.115/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,9 +180,9 @@ diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/systbls.S linux-4.4.113-vs .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/traps.c ---- linux-4.4.113/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/alpha/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/alpha/kernel/traps.c +--- linux-4.4.115/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 @@ -174,7 +174,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); @@ -193,9 +193,9 @@ diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/traps.c linux-4.4.113-vs2. dik_show_regs(regs, r9_15); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-4.4.113/arch/arm/Kconfig linux-4.4.113-vs2.3.9.6/arch/arm/Kconfig ---- linux-4.4.113/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/arm/Kconfig linux-4.4.115-vs2.3.9.7/arch/arm/Kconfig +--- linux-4.4.115/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000 @@ -2159,6 +2159,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-4.4.113/arch/arm/Kconfig linux-4.4.113-vs2.3.9.6/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/calls.S linux-4.4.113-vs2.3.9.6/arch/arm/kernel/calls.S ---- linux-4.4.113/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/arm/kernel/calls.S linux-4.4.115-vs2.3.9.7/arch/arm/kernel/calls.S +--- linux-4.4.115/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,9 +217,9 @@ diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/calls.S linux-4.4.113-vs2.3. CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/arm/kernel/traps.c ---- linux-4.4.113/arch/arm/kernel/traps.c 2018-01-24 21:22:09.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/arm/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/arm/kernel/traps.c +--- linux-4.4.115/arch/arm/kernel/traps.c 2018-02-10 14:37:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000 @@ -258,8 +258,8 @@ static int __die(const char *str, int er print_modules(); @@ -231,9 +231,9 @@ diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/traps.c linux-4.4.113-vs2.3. if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-4.4.113/arch/cris/Kconfig linux-4.4.113-vs2.3.9.6/arch/cris/Kconfig ---- linux-4.4.113/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/cris/Kconfig linux-4.4.115-vs2.3.9.7/arch/cris/Kconfig +--- linux-4.4.115/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000 @@ -581,6 +581,8 @@ source "fs/Kconfig" source "arch/cris/Kconfig.debug" @@ -243,9 +243,9 @@ diff -NurpP --minimal linux-4.4.113/arch/cris/Kconfig linux-4.4.113-vs2.3.9.6/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/ia64/Kconfig linux-4.4.113-vs2.3.9.6/arch/ia64/Kconfig ---- linux-4.4.113/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/ia64/Kconfig linux-4.4.115-vs2.3.9.7/arch/ia64/Kconfig +--- linux-4.4.115/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -606,6 +606,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -255,9 +255,9 @@ diff -NurpP --minimal linux-4.4.113/arch/ia64/Kconfig linux-4.4.113-vs2.3.9.6/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/entry.S linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/entry.S ---- linux-4.4.113/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/ia64/kernel/entry.S linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/entry.S +--- linux-4.4.115/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000 @@ -1694,7 +1694,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr @@ -267,9 +267,9 @@ diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/entry.S linux-4.4.113-vs2.3 data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/ptrace.c ---- linux-4.4.113/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/ia64/kernel/ptrace.c linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/ptrace.c +--- linux-4.4.115/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -278,9 +278,9 @@ diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/ptrace.c linux-4.4.113-vs2. #include #include -diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/traps.c ---- linux-4.4.113/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/ia64/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/traps.c +--- linux-4.4.115/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); @@ -305,9 +305,9 @@ diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/traps.c linux-4.4.113-vs2.3 } } } -diff -NurpP --minimal linux-4.4.113/arch/m32r/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/m32r/kernel/traps.c ---- linux-4.4.113/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/m32r/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/m32r/kernel/traps.c +--- linux-4.4.115/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 @@ -184,8 +184,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); @@ -320,9 +320,9 @@ diff -NurpP --minimal linux-4.4.113/arch/m32r/kernel/traps.c linux-4.4.113-vs2.3 /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-4.4.113/arch/m68k/Kconfig linux-4.4.113-vs2.3.9.6/arch/m68k/Kconfig ---- linux-4.4.113/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/m68k/Kconfig linux-4.4.115-vs2.3.9.7/arch/m68k/Kconfig +--- linux-4.4.115/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -164,6 +164,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -332,9 +332,9 @@ diff -NurpP --minimal linux-4.4.113/arch/m68k/Kconfig linux-4.4.113-vs2.3.9.6/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/mips/Kconfig linux-4.4.113-vs2.3.9.6/arch/mips/Kconfig ---- linux-4.4.113/arch/mips/Kconfig 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/Kconfig linux-4.4.115-vs2.3.9.7/arch/mips/Kconfig +--- linux-4.4.115/arch/mips/Kconfig 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -3026,6 +3026,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -344,9 +344,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/Kconfig linux-4.4.113-vs2.3.9.6/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/mips/kernel/ptrace.c ---- linux-4.4.113/arch/mips/kernel/ptrace.c 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/ptrace.c 2018-01-25 00:25:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/ptrace.c linux-4.4.115-vs2.3.9.7/arch/mips/kernel/ptrace.c +--- linux-4.4.115/arch/mips/kernel/ptrace.c 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/ptrace.c 2018-01-25 00:25:00.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -365,9 +365,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/ptrace.c linux-4.4.113-vs2. 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-4.4.113/arch/mips/kernel/scall32-o32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall32-o32.S ---- linux-4.4.113/arch/mips/kernel/scall32-o32.S 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/scall32-o32.S linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall32-o32.S +--- linux-4.4.115/arch/mips/kernel/scall32-o32.S 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000 @@ -512,7 +512,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify /* 4275 */ @@ -377,9 +377,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall32-o32.S linux-4.4.113 PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-64.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-64.S ---- linux-4.4.113/arch/mips/kernel/scall64-64.S 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/scall64-64.S linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-64.S +--- linux-4.4.115/arch/mips/kernel/scall64-64.S 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000 @@ -349,7 +349,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify @@ -389,9 +389,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-64.S linux-4.4.113- PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-n32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-n32.S ---- linux-4.4.113/arch/mips/kernel/scall64-n32.S 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/scall64-n32.S linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-n32.S +--- linux-4.4.115/arch/mips/kernel/scall64-n32.S 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000 @@ -339,7 +339,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify @@ -401,9 +401,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-n32.S linux-4.4.113 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-o32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-o32.S ---- linux-4.4.113/arch/mips/kernel/scall64-o32.S 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/scall64-o32.S linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-o32.S +--- linux-4.4.115/arch/mips/kernel/scall64-o32.S 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000 @@ -495,7 +495,7 @@ EXPORT(sys32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ @@ -413,9 +413,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-o32.S linux-4.4.113 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/mips/kernel/traps.c ---- linux-4.4.113/arch/mips/kernel/traps.c 2018-01-24 21:22:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/mips/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/mips/kernel/traps.c +--- linux-4.4.115/arch/mips/kernel/traps.c 2018-02-10 14:37:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 @@ -353,9 +353,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); @@ -430,9 +430,9 @@ diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/traps.c linux-4.4.113-vs2.3 if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-4.4.113/arch/parisc/Kconfig linux-4.4.113-vs2.3.9.6/arch/parisc/Kconfig ---- linux-4.4.113/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/parisc/Kconfig linux-4.4.115-vs2.3.9.7/arch/parisc/Kconfig +--- linux-4.4.115/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -341,6 +341,8 @@ config SECCOMP If unsure, say Y. Only embedded should say N here. @@ -442,9 +442,9 @@ diff -NurpP --minimal linux-4.4.113/arch/parisc/Kconfig linux-4.4.113-vs2.3.9.6/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/syscall_table.S linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/syscall_table.S ---- linux-4.4.113/arch/parisc/kernel/syscall_table.S 2018-01-24 21:22:12.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/parisc/kernel/syscall_table.S linux-4.4.115-vs2.3.9.7/arch/parisc/kernel/syscall_table.S +--- linux-4.4.115/arch/parisc/kernel/syscall_table.S 2018-02-10 14:38:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000 @@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) @@ -454,9 +454,9 @@ diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/syscall_table.S linux-4.4 ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ ENTRY_COMP(keyctl) -diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/traps.c ---- linux-4.4.113/arch/parisc/kernel/traps.c 2018-01-24 21:22:12.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/parisc/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/parisc/kernel/traps.c +--- linux-4.4.115/arch/parisc/kernel/traps.c 2018-02-10 14:38:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ return; /* STFU */ @@ -480,9 +480,9 @@ diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/traps.c linux-4.4.113-vs2 /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-4.4.113/arch/powerpc/Kconfig linux-4.4.113-vs2.3.9.6/arch/powerpc/Kconfig ---- linux-4.4.113/arch/powerpc/Kconfig 2018-01-24 21:22:12.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/powerpc/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/powerpc/Kconfig linux-4.4.115-vs2.3.9.7/arch/powerpc/Kconfig +--- linux-4.4.115/arch/powerpc/Kconfig 2018-02-10 14:38:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/powerpc/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -1080,6 +1080,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -492,9 +492,9 @@ diff -NurpP --minimal linux-4.4.113/arch/powerpc/Kconfig linux-4.4.113-vs2.3.9.6 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/powerpc/include/uapi/asm/unistd.h ---- linux-4.4.113/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.115-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h +--- linux-4.4.115/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -504,9 +504,9 @@ diff -NurpP --minimal linux-4.4.113/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-4.4.113/arch/powerpc/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/powerpc/kernel/traps.c ---- linux-4.4.113/arch/powerpc/kernel/traps.c 2018-01-24 21:22:12.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/powerpc/kernel/traps.c linux-4.4.115-vs2.3.9.7/arch/powerpc/kernel/traps.c +--- linux-4.4.115/arch/powerpc/kernel/traps.c 2018-02-10 14:38:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000 @@ -1315,8 +1315,9 @@ void nonrecoverable_exception(struct pt_ void trace_syscall(struct pt_regs *regs) @@ -519,10 +519,10 @@ diff -NurpP --minimal linux-4.4.113/arch/powerpc/kernel/traps.c linux-4.4.113-vs regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); } -diff -NurpP --minimal linux-4.4.113/arch/s390/Kconfig linux-4.4.113-vs2.3.9.6/arch/s390/Kconfig ---- linux-4.4.113/arch/s390/Kconfig 2018-01-24 21:22:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/s390/Kconfig 2018-01-09 16:36:21.000000000 +0000 -@@ -729,6 +729,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.115/arch/s390/Kconfig linux-4.4.115-vs2.3.9.7/arch/s390/Kconfig +--- linux-4.4.115/arch/s390/Kconfig 2018-02-10 14:38:01.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/s390/Kconfig 2018-02-10 15:16:50.000000000 +0000 +@@ -730,6 +730,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -531,9 +531,9 @@ diff -NurpP --minimal linux-4.4.113/arch/s390/Kconfig linux-4.4.113-vs2.3.9.6/ar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/s390/include/asm/tlb.h linux-4.4.113-vs2.3.9.6/arch/s390/include/asm/tlb.h ---- linux-4.4.113/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/s390/include/asm/tlb.h linux-4.4.115-vs2.3.9.7/arch/s390/include/asm/tlb.h +--- linux-4.4.115/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000 @@ -24,6 +24,7 @@ #include #include @@ -542,9 +542,9 @@ diff -NurpP --minimal linux-4.4.113/arch/s390/include/asm/tlb.h linux-4.4.113-vs #include #include #include -diff -NurpP --minimal linux-4.4.113/arch/s390/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/s390/include/uapi/asm/unistd.h ---- linux-4.4.113/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/s390/include/uapi/asm/unistd.h linux-4.4.115-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h +--- linux-4.4.115/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000 @@ -200,7 +200,7 @@ #define __NR_clock_gettime 260 #define __NR_clock_getres 261 @@ -554,9 +554,9 @@ diff -NurpP --minimal linux-4.4.113/arch/s390/include/uapi/asm/unistd.h linux-4. #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/s390/kernel/ptrace.c ---- linux-4.4.113/arch/s390/kernel/ptrace.c 2018-01-24 21:22:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/s390/kernel/ptrace.c linux-4.4.115-vs2.3.9.7/arch/s390/kernel/ptrace.c +--- linux-4.4.115/arch/s390/kernel/ptrace.c 2018-02-10 14:38:01.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -565,9 +565,9 @@ diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/ptrace.c linux-4.4.113-vs2. #include #include #include -diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/syscalls.S linux-4.4.113-vs2.3.9.6/arch/s390/kernel/syscalls.S ---- linux-4.4.113/arch/s390/kernel/syscalls.S 2018-01-24 21:22:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/s390/kernel/syscalls.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/s390/kernel/syscalls.S linux-4.4.115-vs2.3.9.7/arch/s390/kernel/syscalls.S +--- linux-4.4.115/arch/s390/kernel/syscalls.S 2018-02-10 14:38:01.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/s390/kernel/syscalls.S 2018-01-09 16:36:21.000000000 +0000 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */ SYSCALL(sys_clock_getres,compat_sys_clock_getres) @@ -577,9 +577,9 @@ diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/syscalls.S linux-4.4.113-vs SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64) SYSCALL(sys_statfs64,compat_sys_statfs64) SYSCALL(sys_fstatfs64,compat_sys_fstatfs64) -diff -NurpP --minimal linux-4.4.113/arch/sh/Kconfig linux-4.4.113-vs2.3.9.6/arch/sh/Kconfig ---- linux-4.4.113/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sh/Kconfig linux-4.4.115-vs2.3.9.7/arch/sh/Kconfig +--- linux-4.4.115/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -883,6 +883,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -589,9 +589,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sh/Kconfig linux-4.4.113-vs2.3.9.6/arch source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/sh/kernel/irq.c linux-4.4.113-vs2.3.9.6/arch/sh/kernel/irq.c ---- linux-4.4.113/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sh/kernel/irq.c linux-4.4.115-vs2.3.9.7/arch/sh/kernel/irq.c +--- linux-4.4.115/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -600,9 +600,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sh/kernel/irq.c linux-4.4.113-vs2.3.9.6 #include #include #include -diff -NurpP --minimal linux-4.4.113/arch/sparc/Kconfig linux-4.4.113-vs2.3.9.6/arch/sparc/Kconfig ---- linux-4.4.113/arch/sparc/Kconfig 2018-01-24 21:22:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sparc/Kconfig linux-4.4.115-vs2.3.9.7/arch/sparc/Kconfig +--- linux-4.4.115/arch/sparc/Kconfig 2018-02-10 14:38:01.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000 @@ -561,6 +561,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -612,9 +612,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sparc/Kconfig linux-4.4.113-vs2.3.9.6/a source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/sparc/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/sparc/include/uapi/asm/unistd.h ---- linux-4.4.113/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sparc/include/uapi/asm/unistd.h linux-4.4.115-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h +--- linux-4.4.115/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -624,9 +624,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sparc/include/uapi/asm/unistd.h linux-4 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-4.4.113/arch/sparc/kernel/systbls_32.S linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_32.S ---- linux-4.4.113/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sparc/kernel/systbls_32.S linux-4.4.115-vs2.3.9.7/arch/sparc/kernel/systbls_32.S +--- linux-4.4.115/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36:21.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 @@ -636,9 +636,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sparc/kernel/systbls_32.S linux-4.4.113 /*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-4.4.113/arch/sparc/kernel/systbls_64.S linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_64.S ---- linux-4.4.113/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/sparc/kernel/systbls_64.S linux-4.4.115-vs2.3.9.7/arch/sparc/kernel/systbls_64.S +--- linux-4.4.115/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36:21.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 @@ -657,9 +657,9 @@ diff -NurpP --minimal linux-4.4.113/arch/sparc/kernel/systbls_64.S linux-4.4.113 /*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-4.4.113/arch/um/Kconfig.rest linux-4.4.113-vs2.3.9.6/arch/um/Kconfig.rest ---- linux-4.4.113/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/um/Kconfig.rest linux-4.4.115-vs2.3.9.7/arch/um/Kconfig.rest +--- linux-4.4.115/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -669,10 +669,10 @@ diff -NurpP --minimal linux-4.4.113/arch/um/Kconfig.rest linux-4.4.113-vs2.3.9.6 source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/x86/Kconfig linux-4.4.113-vs2.3.9.6/arch/x86/Kconfig ---- linux-4.4.113/arch/x86/Kconfig 2018-01-24 21:22:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/x86/Kconfig 2018-01-25 00:25:00.000000000 +0000 -@@ -2686,6 +2686,8 @@ source "fs/Kconfig" +diff -NurpP --minimal linux-4.4.115/arch/x86/Kconfig linux-4.4.115-vs2.3.9.7/arch/x86/Kconfig +--- linux-4.4.115/arch/x86/Kconfig 2018-02-10 14:38:02.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/x86/Kconfig 2018-02-10 15:16:50.000000000 +0000 +@@ -2687,6 +2687,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -681,9 +681,9 @@ diff -NurpP --minimal linux-4.4.113/arch/x86/Kconfig linux-4.4.113-vs2.3.9.6/arc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-4.4.113/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_32.tbl ---- linux-4.4.113/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-24 21:22:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.115-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl +--- linux-4.4.115/arch/x86/entry/syscalls/syscall_32.tbl 2018-02-10 14:38:02.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -693,9 +693,9 @@ diff -NurpP --minimal linux-4.4.113/arch/x86/entry/syscalls/syscall_32.tbl linux 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-4.4.113/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_64.tbl ---- linux-4.4.113/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.115-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl +--- linux-4.4.115/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -705,9 +705,9 @@ diff -NurpP --minimal linux-4.4.113/arch/x86/entry/syscalls/syscall_64.tbl linux 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-4.4.113/block/ioprio.c linux-4.4.113-vs2.3.9.6/block/ioprio.c ---- linux-4.4.113/block/ioprio.c 2018-01-24 21:22:16.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/block/ioprio.c linux-4.4.115-vs2.3.9.7/block/ioprio.c +--- linux-4.4.115/block/ioprio.c 2018-02-10 14:38:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -734,9 +734,9 @@ diff -NurpP --minimal linux-4.4.113/block/ioprio.c linux-4.4.113-vs2.3.9.6/block tmpio = get_task_ioprio(p); if (tmpio < 0) continue; -diff -NurpP --minimal linux-4.4.113/drivers/block/Kconfig linux-4.4.113-vs2.3.9.6/drivers/block/Kconfig ---- linux-4.4.113/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/block/Kconfig linux-4.4.115-vs2.3.9.7/drivers/block/Kconfig +--- linux-4.4.115/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000 @@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -751,9 +751,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/block/Kconfig linux-4.4.113-vs2.3.9. config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-4.4.113/drivers/block/Makefile linux-4.4.113-vs2.3.9.6/drivers/block/Makefile ---- linux-4.4.113/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/block/Makefile 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/block/Makefile linux-4.4.115-vs2.3.9.7/drivers/block/Makefile +--- linux-4.4.115/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/block/Makefile 2018-01-09 16:36:23.000000000 +0000 @@ -32,6 +32,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o obj-$(CONFIG_BLK_DEV_SX8) += sx8.o @@ -762,9 +762,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/block/Makefile linux-4.4.113-vs2.3.9 obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-4.4.113/drivers/block/loop.c linux-4.4.113-vs2.3.9.6/drivers/block/loop.c ---- linux-4.4.113/drivers/block/loop.c 2018-01-24 21:22:21.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/block/loop.c 2018-01-09 23:00:25.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/block/loop.c linux-4.4.115-vs2.3.9.7/drivers/block/loop.c +--- linux-4.4.115/drivers/block/loop.c 2018-02-10 14:38:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/block/loop.c 2018-02-10 15:16:50.000000000 +0000 @@ -76,6 +76,7 @@ #include #include @@ -820,9 +820,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/block/loop.c linux-4.4.113-vs2.3.9.6 atomic_inc(&lo->lo_refcnt); out: mutex_unlock(&loop_index_mutex); -diff -NurpP --minimal linux-4.4.113/drivers/block/loop.h linux-4.4.113-vs2.3.9.6/drivers/block/loop.h ---- linux-4.4.113/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/block/loop.h linux-4.4.115-vs2.3.9.7/drivers/block/loop.h +--- linux-4.4.115/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000 @@ -43,6 +43,7 @@ struct loop_device { struct loop_func_table *lo_encryption; __u32 lo_init[2]; @@ -831,9 +831,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/block/loop.h linux-4.4.113-vs2.3.9.6 int (*ioctl)(struct loop_device *, int cmd, unsigned long arg); -diff -NurpP --minimal linux-4.4.113/drivers/block/vroot.c linux-4.4.113-vs2.3.9.6/drivers/block/vroot.c ---- linux-4.4.113/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/block/vroot.c 2018-01-11 07:37:22.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/block/vroot.c linux-4.4.115-vs2.3.9.7/drivers/block/vroot.c +--- linux-4.4.115/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/block/vroot.c 2018-01-11 07:37:22.000000000 +0000 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c @@ -1126,9 +1126,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/block/vroot.c linux-4.4.113-vs2.3.9. + +#endif + -diff -NurpP --minimal linux-4.4.113/drivers/infiniband/core/addr.c linux-4.4.113-vs2.3.9.6/drivers/infiniband/core/addr.c ---- linux-4.4.113/drivers/infiniband/core/addr.c 2018-01-24 21:22:30.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/infiniband/core/addr.c linux-4.4.115-vs2.3.9.7/drivers/infiniband/core/addr.c +--- linux-4.4.115/drivers/infiniband/core/addr.c 2018-02-10 14:38:12.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000 @@ -283,7 +283,7 @@ static int addr6_resolve(struct sockaddr if (ipv6_addr_any(&fl6.saddr)) { @@ -1138,9 +1138,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/infiniband/core/addr.c linux-4.4.113 if (ret) goto put; -diff -NurpP --minimal linux-4.4.113/drivers/md/dm-ioctl.c linux-4.4.113-vs2.3.9.6/drivers/md/dm-ioctl.c ---- linux-4.4.113/drivers/md/dm-ioctl.c 2018-01-24 21:22:32.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/md/dm-ioctl.c linux-4.4.115-vs2.3.9.7/drivers/md/dm-ioctl.c +--- linux-4.4.115/drivers/md/dm-ioctl.c 2018-02-10 14:38:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -1226,9 +1226,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/md/dm-ioctl.c linux-4.4.113-vs2.3.9. return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-4.4.113/drivers/md/dm.c linux-4.4.113-vs2.3.9.6/drivers/md/dm.c ---- linux-4.4.113/drivers/md/dm.c 2018-01-24 21:22:32.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/md/dm.c 2018-01-09 16:49:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/md/dm.c linux-4.4.115-vs2.3.9.7/drivers/md/dm.c +--- linux-4.4.115/drivers/md/dm.c 2018-02-10 14:38:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/md/dm.c 2018-01-09 16:49:30.000000000 +0000 @@ -25,6 +25,7 @@ #include /* for rq_end_sector() */ #include @@ -1301,9 +1301,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/md/dm.c linux-4.4.113-vs2.3.9.6/driv md->queue = blk_alloc_queue(GFP_KERNEL); if (!md->queue) goto bad; -diff -NurpP --minimal linux-4.4.113/drivers/md/dm.h linux-4.4.113-vs2.3.9.6/drivers/md/dm.h ---- linux-4.4.113/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/md/dm.h linux-4.4.115-vs2.3.9.7/drivers/md/dm.h +--- linux-4.4.115/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000 @@ -52,6 +52,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; @@ -1313,9 +1313,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/md/dm.h linux-4.4.113-vs2.3.9.6/driv /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-4.4.113/drivers/net/tun.c linux-4.4.113-vs2.3.9.6/drivers/net/tun.c ---- linux-4.4.113/drivers/net/tun.c 2018-01-24 21:22:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/net/tun.c linux-4.4.115-vs2.3.9.7/drivers/net/tun.c +--- linux-4.4.115/drivers/net/tun.c 2018-02-10 14:38:22.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000 @@ -65,6 +65,7 @@ #include #include @@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/net/tun.c linux-4.4.113-vs2.3.9.6/dr case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-4.4.113/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.113-vs2.3.9.6/drivers/scsi/cxgbi/libcxgbi.c ---- linux-4.4.113/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.115-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c +--- linux-4.4.115/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000 @@ -768,7 +768,8 @@ static struct cxgbi_sock *cxgbi_check_ro struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); @@ -1387,9 +1387,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.113- if (err) { pr_info("failed to get source address to reach %pI6\n", &daddr6->sin6_addr); -diff -NurpP --minimal linux-4.4.113/drivers/tty/sysrq.c linux-4.4.113-vs2.3.9.6/drivers/tty/sysrq.c ---- linux-4.4.113/drivers/tty/sysrq.c 2018-01-24 21:22:49.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/tty/sysrq.c 2018-01-25 00:25:02.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/tty/sysrq.c linux-4.4.115-vs2.3.9.7/drivers/tty/sysrq.c +--- linux-4.4.115/drivers/tty/sysrq.c 2018-02-10 14:38:36.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/tty/sysrq.c 2018-01-25 00:25:02.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -1441,9 +1441,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/tty/sysrq.c linux-4.4.113-vs2.3.9.6/ else retval = -1; return retval; -diff -NurpP --minimal linux-4.4.113/drivers/tty/tty_io.c linux-4.4.113-vs2.3.9.6/drivers/tty/tty_io.c ---- linux-4.4.113/drivers/tty/tty_io.c 2018-01-24 21:22:49.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/drivers/tty/tty_io.c linux-4.4.115-vs2.3.9.7/drivers/tty/tty_io.c +--- linux-4.4.115/drivers/tty/tty_io.c 2018-02-10 14:38:36.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000 @@ -104,6 +104,7 @@ #include @@ -1470,9 +1470,9 @@ diff -NurpP --minimal linux-4.4.113/drivers/tty/tty_io.c linux-4.4.113-vs2.3.9.6 if (pgrp_nr < 0) return -EINVAL; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.113/fs/attr.c linux-4.4.113-vs2.3.9.6/fs/attr.c ---- linux-4.4.113/fs/attr.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/attr.c 2018-01-09 17:27:12.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/attr.c linux-4.4.115-vs2.3.9.7/fs/attr.c +--- linux-4.4.115/fs/attr.c 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/attr.c 2018-01-09 17:27:12.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -1513,9 +1513,9 @@ diff -NurpP --minimal linux-4.4.113/fs/attr.c linux-4.4.113-vs2.3.9.6/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-4.4.113/fs/block_dev.c linux-4.4.113-vs2.3.9.6/fs/block_dev.c ---- linux-4.4.113/fs/block_dev.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/block_dev.c linux-4.4.115-vs2.3.9.7/fs/block_dev.c +--- linux-4.4.115/fs/block_dev.c 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000 @@ -29,6 +29,7 @@ #include #include @@ -1553,9 +1553,9 @@ diff -NurpP --minimal linux-4.4.113/fs/block_dev.c linux-4.4.113-vs2.3.9.6/fs/bl if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-4.4.113/fs/btrfs/ctree.h linux-4.4.113-vs2.3.9.6/fs/btrfs/ctree.h ---- linux-4.4.113/fs/btrfs/ctree.h 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/btrfs/ctree.h linux-4.4.115-vs2.3.9.7/fs/btrfs/ctree.h +--- linux-4.4.115/fs/btrfs/ctree.h 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000 @@ -731,11 +731,14 @@ struct btrfs_inode_item { /* modification sequence number for NFS */ __le64 sequence; @@ -1608,9 +1608,9 @@ diff -NurpP --minimal linux-4.4.113/fs/btrfs/ctree.h linux-4.4.113-vs2.3.9.6/fs/ 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-4.4.113/fs/btrfs/disk-io.c linux-4.4.113-vs2.3.9.6/fs/btrfs/disk-io.c ---- linux-4.4.113/fs/btrfs/disk-io.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/btrfs/disk-io.c linux-4.4.115-vs2.3.9.7/fs/btrfs/disk-io.c +--- linux-4.4.115/fs/btrfs/disk-io.c 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000 @@ -2736,6 +2736,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } @@ -1621,9 +1621,9 @@ diff -NurpP --minimal linux-4.4.113/fs/btrfs/disk-io.c linux-4.4.113-vs2.3.9.6/f features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-4.4.113/fs/btrfs/inode.c linux-4.4.113-vs2.3.9.6/fs/btrfs/inode.c ---- linux-4.4.113/fs/btrfs/inode.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/btrfs/inode.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/btrfs/inode.c linux-4.4.115-vs2.3.9.7/fs/btrfs/inode.c +--- linux-4.4.115/fs/btrfs/inode.c 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/btrfs/inode.c 2018-01-09 16:36:24.000000000 +0000 @@ -43,6 +43,7 @@ #include #include @@ -1704,9 +1704,9 @@ diff -NurpP --minimal linux-4.4.113/fs/btrfs/inode.c linux-4.4.113-vs2.3.9.6/fs/ .get_acl = btrfs_get_acl, .set_acl = btrfs_set_acl, .update_time = btrfs_update_time, -diff -NurpP --minimal linux-4.4.113/fs/btrfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/btrfs/ioctl.c ---- linux-4.4.113/fs/btrfs/ioctl.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/btrfs/ioctl.c linux-4.4.115-vs2.3.9.7/fs/btrfs/ioctl.c +--- linux-4.4.115/fs/btrfs/ioctl.c 2018-02-10 14:38:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000 @@ -108,10 +108,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1885,9 +1885,9 @@ diff -NurpP --minimal linux-4.4.113/fs/btrfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-4.4.113/fs/btrfs/super.c linux-4.4.113-vs2.3.9.6/fs/btrfs/super.c ---- linux-4.4.113/fs/btrfs/super.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/btrfs/super.c linux-4.4.115-vs2.3.9.7/fs/btrfs/super.c +--- linux-4.4.115/fs/btrfs/super.c 2018-02-10 14:38:40.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000 @@ -306,7 +306,7 @@ enum { #ifdef CONFIG_BTRFS_DEBUG Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all, @@ -1943,9 +1943,9 @@ diff -NurpP --minimal linux-4.4.113/fs/btrfs/super.c linux-4.4.113-vs2.3.9.6/fs/ if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) goto out; -diff -NurpP --minimal linux-4.4.113/fs/char_dev.c linux-4.4.113-vs2.3.9.6/fs/char_dev.c ---- linux-4.4.113/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/char_dev.c linux-4.4.115-vs2.3.9.7/fs/char_dev.c +--- linux-4.4.115/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000 @@ -21,6 +21,8 @@ #include #include @@ -1978,9 +1978,9 @@ diff -NurpP --minimal linux-4.4.113/fs/char_dev.c linux-4.4.113-vs2.3.9.6/fs/cha if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-4.4.113/fs/dcache.c linux-4.4.113-vs2.3.9.6/fs/dcache.c ---- linux-4.4.113/fs/dcache.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/dcache.c linux-4.4.115-vs2.3.9.7/fs/dcache.c +--- linux-4.4.115/fs/dcache.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -2072,9 +2072,9 @@ diff -NurpP --minimal linux-4.4.113/fs/dcache.c linux-4.4.113-vs2.3.9.6/fs/dcach } } return D_WALK_CONTINUE; -diff -NurpP --minimal linux-4.4.113/fs/devpts/inode.c linux-4.4.113-vs2.3.9.6/fs/devpts/inode.c ---- linux-4.4.113/fs/devpts/inode.c 2018-01-24 21:22:51.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/devpts/inode.c linux-4.4.115-vs2.3.9.7/fs/devpts/inode.c +--- linux-4.4.115/fs/devpts/inode.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -2162,9 +2162,9 @@ diff -NurpP --minimal linux-4.4.113/fs/devpts/inode.c linux-4.4.113-vs2.3.9.6/fs inode->i_private = priv; sprintf(s, "%d", index); -diff -NurpP --minimal linux-4.4.113/fs/ext2/balloc.c linux-4.4.113-vs2.3.9.6/fs/ext2/balloc.c ---- linux-4.4.113/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/balloc.c linux-4.4.115-vs2.3.9.7/fs/ext2/balloc.c +--- linux-4.4.115/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000 @@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); @@ -2173,9 +2173,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/balloc.c linux-4.4.113-vs2.3.9.6/fs/ BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-4.4.113/fs/ext2/ext2.h linux-4.4.113-vs2.3.9.6/fs/ext2/ext2.h ---- linux-4.4.113/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/ext2.h 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/ext2.h linux-4.4.115-vs2.3.9.7/fs/ext2/ext2.h +--- linux-4.4.115/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/ext2.h 2018-01-09 16:36:24.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) */ @@ -2223,18 +2223,18 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/ext2.h linux-4.4.113-vs2.3.9.6/fs/ex /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-4.4.113/fs/ext2/file.c linux-4.4.113-vs2.3.9.6/fs/ext2/file.c ---- linux-4.4.113/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/file.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/file.c linux-4.4.115-vs2.3.9.7/fs/ext2/file.c +--- linux-4.4.115/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/file.c 2018-01-09 16:36:24.000000000 +0000 @@ -202,4 +202,5 @@ const struct inode_operations ext2_file_ .get_acl = ext2_get_acl, .set_acl = ext2_set_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-4.4.113/fs/ext2/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ext2/ialloc.c ---- linux-4.4.113/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/ialloc.c linux-4.4.115-vs2.3.9.7/fs/ext2/ialloc.c +--- linux-4.4.115/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -2251,9 +2251,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-4.4.113/fs/ext2/inode.c linux-4.4.113-vs2.3.9.6/fs/ext2/inode.c ---- linux-4.4.113/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/inode.c linux-4.4.115-vs2.3.9.7/fs/ext2/inode.c +--- linux-4.4.115/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2388,9 +2388,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/inode.c linux-4.4.113-vs2.3.9.6/fs/e error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-4.4.113/fs/ext2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ext2/ioctl.c ---- linux-4.4.113/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/ioctl.c linux-4.4.115-vs2.3.9.7/fs/ext2/ioctl.c +--- linux-4.4.115/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000 @@ -17,6 +17,16 @@ #include @@ -2440,9 +2440,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/e flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-4.4.113/fs/ext2/namei.c linux-4.4.113-vs2.3.9.6/fs/ext2/namei.c ---- linux-4.4.113/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/namei.c linux-4.4.115-vs2.3.9.7/fs/ext2/namei.c +--- linux-4.4.115/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000 @@ -32,6 +32,7 @@ #include @@ -2467,9 +2467,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/namei.c linux-4.4.113-vs2.3.9.6/fs/e .get_acl = ext2_get_acl, .set_acl = ext2_set_acl, }; -diff -NurpP --minimal linux-4.4.113/fs/ext2/super.c linux-4.4.113-vs2.3.9.6/fs/ext2/super.c ---- linux-4.4.113/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext2/super.c linux-4.4.115-vs2.3.9.7/fs/ext2/super.c +--- linux-4.4.115/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +0000 @@ -408,7 +408,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, @@ -2535,9 +2535,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext2/super.c linux-4.4.113-vs2.3.9.6/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-4.4.113/fs/ext4/ext4.h linux-4.4.113-vs2.3.9.6/fs/ext4/ext4.h ---- linux-4.4.113/fs/ext4/ext4.h 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/ext4.h linux-4.4.115-vs2.3.9.7/fs/ext4/ext4.h +--- linux-4.4.115/fs/ext4/ext4.h 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +0000 @@ -375,8 +375,11 @@ struct flex_groups { #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ @@ -2583,9 +2583,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/ext4.h linux-4.4.113-vs2.3.9.6/fs/ex extern int ext4_alloc_da_blocks(struct inode *inode); extern void ext4_set_aops(struct inode *inode); extern int ext4_writepage_trans_blocks(struct inode *); -diff -NurpP --minimal linux-4.4.113/fs/ext4/file.c linux-4.4.113-vs2.3.9.6/fs/ext4/file.c ---- linux-4.4.113/fs/ext4/file.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/file.c linux-4.4.115-vs2.3.9.7/fs/ext4/file.c +--- linux-4.4.115/fs/ext4/file.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000 @@ -749,5 +749,6 @@ const struct inode_operations ext4_file_ .get_acl = ext4_get_acl, .set_acl = ext4_set_acl, @@ -2593,9 +2593,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/file.c linux-4.4.113-vs2.3.9.6/fs/ex + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-4.4.113/fs/ext4/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ext4/ialloc.c ---- linux-4.4.113/fs/ext4/ialloc.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/ialloc.c linux-4.4.115-vs2.3.9.7/fs/ext4/ialloc.c +--- linux-4.4.115/fs/ext4/ialloc.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -2612,9 +2612,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ } else inode_init_owner(inode, dir, mode); err = dquot_initialize(inode); -diff -NurpP --minimal linux-4.4.113/fs/ext4/inode.c linux-4.4.113-vs2.3.9.6/fs/ext4/inode.c ---- linux-4.4.113/fs/ext4/inode.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/inode.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/inode.c linux-4.4.115-vs2.3.9.7/fs/ext4/inode.c +--- linux-4.4.115/fs/ext4/inode.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/inode.c 2018-01-09 16:36:31.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -2754,9 +2754,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/inode.c linux-4.4.113-vs2.3.9.6/fs/e error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-4.4.113/fs/ext4/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ext4/ioctl.c ---- linux-4.4.113/fs/ext4/ioctl.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/ioctl.c linux-4.4.115-vs2.3.9.7/fs/ext4/ioctl.c +--- linux-4.4.115/fs/ext4/ioctl.c 2018-02-10 14:38:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -2822,9 +2822,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/ioctl.c linux-4.4.113-vs2.3.9.6/fs/e if (!capable(CAP_LINUX_IMMUTABLE)) goto flags_out; } -diff -NurpP --minimal linux-4.4.113/fs/ext4/namei.c linux-4.4.113-vs2.3.9.6/fs/ext4/namei.c ---- linux-4.4.113/fs/ext4/namei.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/namei.c 2018-01-09 16:36:31.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/namei.c linux-4.4.115-vs2.3.9.7/fs/ext4/namei.c +--- linux-4.4.115/fs/ext4/namei.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/namei.c 2018-01-09 16:36:31.000000000 +0000 @@ -33,6 +33,7 @@ #include #include @@ -2849,9 +2849,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/namei.c linux-4.4.113-vs2.3.9.6/fs/e }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-4.4.113/fs/ext4/super.c linux-4.4.113-vs2.3.9.6/fs/ext4/super.c ---- linux-4.4.113/fs/ext4/super.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ext4/super.c linux-4.4.115-vs2.3.9.7/fs/ext4/super.c +--- linux-4.4.115/fs/ext4/super.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000 @@ -1165,6 +1165,7 @@ enum { Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, @@ -2916,9 +2916,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ext4/super.c linux-4.4.113-vs2.3.9.6/fs/e sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-4.4.113/fs/fcntl.c linux-4.4.113-vs2.3.9.6/fs/fcntl.c ---- linux-4.4.113/fs/fcntl.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/fcntl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/fcntl.c linux-4.4.115-vs2.3.9.7/fs/fcntl.c +--- linux-4.4.115/fs/fcntl.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/fcntl.c 2018-02-10 15:16:50.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -2927,7 +2927,7 @@ diff -NurpP --minimal linux-4.4.113/fs/fcntl.c linux-4.4.113-vs2.3.9.6/fs/fcntl. #include #include -@@ -385,6 +386,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f +@@ -389,6 +390,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f if (!f.file) goto out; @@ -2936,9 +2936,9 @@ diff -NurpP --minimal linux-4.4.113/fs/fcntl.c linux-4.4.113-vs2.3.9.6/fs/fcntl. if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-4.4.113/fs/file.c linux-4.4.113-vs2.3.9.6/fs/file.c ---- linux-4.4.113/fs/file.c 2016-07-05 04:15:07.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/file.c linux-4.4.115-vs2.3.9.7/fs/file.c +--- linux-4.4.115/fs/file.c 2016-07-05 04:15:07.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/file.c 2018-01-09 16:36:32.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -2993,9 +2993,9 @@ diff -NurpP --minimal linux-4.4.113/fs/file.c linux-4.4.113-vs2.3.9.6/fs/file.c return fd; -diff -NurpP --minimal linux-4.4.113/fs/file_table.c linux-4.4.113-vs2.3.9.6/fs/file_table.c ---- linux-4.4.113/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/file_table.c linux-4.4.115-vs2.3.9.7/fs/file_table.c +--- linux-4.4.115/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000 @@ -26,6 +26,8 @@ #include #include @@ -3032,9 +3032,9 @@ diff -NurpP --minimal linux-4.4.113/fs/file_table.c linux-4.4.113-vs2.3.9.6/fs/f file_free(file); } } -diff -NurpP --minimal linux-4.4.113/fs/fs_struct.c linux-4.4.113-vs2.3.9.6/fs/fs_struct.c ---- linux-4.4.113/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/fs_struct.c linux-4.4.115-vs2.3.9.7/fs/fs_struct.c +--- linux-4.4.115/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -3059,9 +3059,9 @@ diff -NurpP --minimal linux-4.4.113/fs/fs_struct.c linux-4.4.113-vs2.3.9.6/fs/fs } return fs; } -diff -NurpP --minimal linux-4.4.113/fs/gfs2/file.c linux-4.4.113-vs2.3.9.6/fs/gfs2/file.c ---- linux-4.4.113/fs/gfs2/file.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/gfs2/file.c linux-4.4.115-vs2.3.9.7/fs/gfs2/file.c +--- linux-4.4.115/fs/gfs2/file.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000 @@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, @@ -3183,9 +3183,9 @@ diff -NurpP --minimal linux-4.4.113/fs/gfs2/file.c linux-4.4.113-vs2.3.9.6/fs/gf static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-4.4.113/fs/gfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/gfs2/inode.h ---- linux-4.4.113/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/gfs2/inode.h linux-4.4.115-vs2.3.9.7/fs/gfs2/inode.h +--- linux-4.4.115/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 @@ -118,6 +118,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3194,9 +3194,9 @@ diff -NurpP --minimal linux-4.4.113/fs/gfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/g #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-4.4.113/fs/hostfs/hostfs.h linux-4.4.113-vs2.3.9.6/fs/hostfs/hostfs.h ---- linux-4.4.113/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/hostfs/hostfs.h linux-4.4.115-vs2.3.9.7/fs/hostfs/hostfs.h +--- linux-4.4.115/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; @@ -3205,9 +3205,9 @@ diff -NurpP --minimal linux-4.4.113/fs/hostfs/hostfs.h linux-4.4.113-vs2.3.9.6/f loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-4.4.113/fs/inode.c linux-4.4.113-vs2.3.9.6/fs/inode.c ---- linux-4.4.113/fs/inode.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/inode.c linux-4.4.115-vs2.3.9.7/fs/inode.c +--- linux-4.4.115/fs/inode.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/inode.c 2018-01-09 16:36:32.000000000 +0000 @@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include @@ -3270,9 +3270,9 @@ diff -NurpP --minimal linux-4.4.113/fs/inode.c linux-4.4.113-vs2.3.9.6/fs/inode. } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-4.4.113/fs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ioctl.c ---- linux-4.4.113/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ioctl.c linux-4.4.115-vs2.3.9.7/fs/ioctl.c +--- linux-4.4.115/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 @@ -15,6 +15,9 @@ #include #include @@ -3283,9 +3283,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ioctl. #include -diff -NurpP --minimal linux-4.4.113/fs/jfs/file.c linux-4.4.113-vs2.3.9.6/fs/jfs/file.c ---- linux-4.4.113/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/file.c linux-4.4.115-vs2.3.9.7/fs/jfs/file.c +--- linux-4.4.115/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000 @@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s return rc; } @@ -3304,9 +3304,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/file.c linux-4.4.113-vs2.3.9.6/fs/jfs }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-4.4.113/fs/jfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/jfs/ioctl.c ---- linux-4.4.113/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/ioctl.c linux-4.4.115-vs2.3.9.7/fs/jfs/ioctl.c +--- linux-4.4.115/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000 @@ -12,6 +12,7 @@ #include #include @@ -3364,9 +3364,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/jf flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_dinode.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_dinode.h ---- linux-4.4.113/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/jfs_dinode.h linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_dinode.h +--- linux-4.4.115/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3383,9 +3383,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_dinode.h linux-4.4.113-vs2.3.9.6/ #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_filsys.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_filsys.h ---- linux-4.4.113/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/jfs_filsys.h linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_filsys.h +--- linux-4.4.115/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3394,9 +3394,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_filsys.h linux-4.4.113-vs2.3.9.6/ /* * file system state (superblock state) -diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_imap.c linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_imap.c ---- linux-4.4.113/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/jfs_imap.c linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_imap.c +--- linux-4.4.115/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -3460,9 +3460,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_imap.c linux-4.4.113-vs2.3.9.6/fs jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.c linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.c ---- linux-4.4.113/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.c 2018-01-14 06:39:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/jfs_inode.c linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_inode.c +--- linux-4.4.115/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_inode.c 2018-01-14 06:39:51.000000000 +0000 @@ -18,6 +18,7 @@ #include @@ -3533,9 +3533,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.c linux-4.4.113-vs2.3.9.6/f } /* -diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.h ---- linux-4.4.113/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/jfs_inode.h linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_inode.h +--- linux-4.4.115/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.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); @@ -3544,9 +3544,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.h linux-4.4.113-vs2.3.9.6/f 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-4.4.113/fs/jfs/namei.c linux-4.4.113-vs2.3.9.6/fs/jfs/namei.c ---- linux-4.4.113/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/namei.c linux-4.4.115-vs2.3.9.7/fs/jfs/namei.c +--- linux-4.4.115/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -3571,9 +3571,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/namei.c linux-4.4.113-vs2.3.9.6/fs/jf }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-4.4.113/fs/jfs/super.c linux-4.4.113-vs2.3.9.6/fs/jfs/super.c ---- linux-4.4.113/fs/jfs/super.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/jfs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/jfs/super.c linux-4.4.115-vs2.3.9.7/fs/jfs/super.c +--- linux-4.4.115/fs/jfs/super.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/jfs/super.c 2018-01-09 16:36:32.000000000 +0000 @@ -206,7 +206,8 @@ enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, @@ -3640,9 +3640,9 @@ diff -NurpP --minimal linux-4.4.113/fs/jfs/super.c linux-4.4.113-vs2.3.9.6/fs/jf if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-4.4.113/fs/libfs.c linux-4.4.113-vs2.3.9.6/fs/libfs.c ---- linux-4.4.113/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/libfs.c linux-4.4.115-vs2.3.9.7/fs/libfs.c +--- linux-4.4.115/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000 @@ -141,13 +141,14 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ @@ -3694,9 +3694,9 @@ diff -NurpP --minimal linux-4.4.113/fs/libfs.c linux-4.4.113-vs2.3.9.6/fs/libfs. ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos) { return -EISDIR; -diff -NurpP --minimal linux-4.4.113/fs/locks.c linux-4.4.113-vs2.3.9.6/fs/locks.c ---- linux-4.4.113/fs/locks.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/locks.c 2018-01-25 00:25:02.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/locks.c linux-4.4.115-vs2.3.9.7/fs/locks.c +--- linux-4.4.115/fs/locks.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/locks.c 2018-01-25 00:25:02.000000000 +0000 @@ -129,6 +129,8 @@ #include #include @@ -3892,9 +3892,9 @@ diff -NurpP --minimal linux-4.4.113/fs/locks.c linux-4.4.113-vs2.3.9.6/fs/locks. return 0; } -diff -NurpP --minimal linux-4.4.113/fs/mount.h linux-4.4.113-vs2.3.9.6/fs/mount.h ---- linux-4.4.113/fs/mount.h 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/mount.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/mount.h linux-4.4.115-vs2.3.9.7/fs/mount.h +--- linux-4.4.115/fs/mount.h 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/mount.h 2018-01-09 16:36:32.000000000 +0000 @@ -68,6 +68,7 @@ struct mount { struct hlist_head mnt_pins; struct fs_pin mnt_umount; @@ -3903,9 +3903,9 @@ diff -NurpP --minimal linux-4.4.113/fs/mount.h linux-4.4.113-vs2.3.9.6/fs/mount. }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-4.4.113/fs/namei.c linux-4.4.113-vs2.3.9.6/fs/namei.c ---- linux-4.4.113/fs/namei.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/namei.c 2018-01-13 03:11:55.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/namei.c linux-4.4.115-vs2.3.9.7/fs/namei.c +--- linux-4.4.115/fs/namei.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/namei.c 2018-01-13 03:11:55.000000000 +0000 @@ -34,10 +34,20 @@ #include #include @@ -4509,9 +4509,9 @@ diff -NurpP --minimal linux-4.4.113/fs/namei.c linux-4.4.113-vs2.3.9.6/fs/namei. /* get the link contents into pagecache */ static char *page_getlink(struct dentry * dentry, struct page **ppage) { -diff -NurpP --minimal linux-4.4.113/fs/namespace.c linux-4.4.113-vs2.3.9.6/fs/namespace.c ---- linux-4.4.113/fs/namespace.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/namespace.c linux-4.4.115-vs2.3.9.7/fs/namespace.c +--- linux-4.4.115/fs/namespace.c 2018-02-10 14:38:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000 @@ -24,6 +24,11 @@ #include #include @@ -4656,9 +4656,9 @@ diff -NurpP --minimal linux-4.4.113/fs/namespace.c linux-4.4.113-vs2.3.9.6/fs/na free_mnt_ns(ns); } -diff -NurpP --minimal linux-4.4.113/fs/nfs/client.c linux-4.4.113-vs2.3.9.6/fs/nfs/client.c ---- linux-4.4.113/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfs/client.c linux-4.4.115-vs2.3.9.7/fs/nfs/client.c +--- linux-4.4.115/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000 @@ -583,6 +583,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -4680,9 +4680,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfs/client.c linux-4.4.113-vs2.3.9.6/fs/n server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-4.4.113/fs/nfs/dir.c linux-4.4.113-vs2.3.9.6/fs/nfs/dir.c ---- linux-4.4.113/fs/nfs/dir.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfs/dir.c linux-4.4.115-vs2.3.9.7/fs/nfs/dir.c +--- linux-4.4.115/fs/nfs/dir.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -4699,9 +4699,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfs/dir.c linux-4.4.113-vs2.3.9.6/fs/nfs/ no_entry: res = d_splice_alias(inode, dentry); if (res != NULL) { -diff -NurpP --minimal linux-4.4.113/fs/nfs/inode.c linux-4.4.113-vs2.3.9.6/fs/nfs/inode.c ---- linux-4.4.113/fs/nfs/inode.c 2018-01-24 21:22:52.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfs/inode.c linux-4.4.115-vs2.3.9.7/fs/nfs/inode.c +--- linux-4.4.115/fs/nfs/inode.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -4827,9 +4827,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfs/inode.c linux-4.4.113-vs2.3.9.6/fs/nf if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-4.4.113/fs/nfs/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs/nfs/nfs3xdr.c ---- linux-4.4.113/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfs/nfs3xdr.c linux-4.4.115-vs2.3.9.7/fs/nfs/nfs3xdr.c +--- linux-4.4.115/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000 @@ -20,6 +20,7 @@ #include #include @@ -4975,9 +4975,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfs/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs/ } /* -diff -NurpP --minimal linux-4.4.113/fs/nfs/super.c linux-4.4.113-vs2.3.9.6/fs/nfs/super.c ---- linux-4.4.113/fs/nfs/super.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfs/super.c linux-4.4.115-vs2.3.9.7/fs/nfs/super.c +--- linux-4.4.115/fs/nfs/super.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000 @@ -54,6 +54,7 @@ #include #include @@ -5051,9 +5051,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfs/super.c linux-4.4.113-vs2.3.9.6/fs/nf /* * options that take text values -diff -NurpP --minimal linux-4.4.113/fs/nfsd/auth.c linux-4.4.113-vs2.3.9.6/fs/nfsd/auth.c ---- linux-4.4.113/fs/nfsd/auth.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfsd/auth.c 2018-01-11 08:03:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfsd/auth.c linux-4.4.115-vs2.3.9.7/fs/nfsd/auth.c +--- linux-4.4.115/fs/nfsd/auth.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfsd/auth.c 2018-02-10 15:16:50.000000000 +0000 @@ -1,6 +1,7 @@ /* Copyright (C) 1995, 1996 Olaf Kirch */ @@ -5072,9 +5072,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfsd/auth.c linux-4.4.113-vs2.3.9.6/fs/nf rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs3xdr.c ---- linux-4.4.113/fs/nfsd/nfs3xdr.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfsd/nfs3xdr.c linux-4.4.115-vs2.3.9.7/fs/nfsd/nfs3xdr.c +--- linux-4.4.115/fs/nfsd/nfs3xdr.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000 @@ -8,6 +8,7 @@ #include @@ -5128,9 +5128,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs4xdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs4xdr.c ---- linux-4.4.113/fs/nfsd/nfs4xdr.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfsd/nfs4xdr.c linux-4.4.115-vs2.3.9.7/fs/nfsd/nfs4xdr.c +--- linux-4.4.115/fs/nfsd/nfs4xdr.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000 @@ -40,6 +40,7 @@ #include #include @@ -5158,9 +5158,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs4xdr.c linux-4.4.113-vs2.3.9.6/fs if (status) goto out; } -diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfsxdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfsxdr.c ---- linux-4.4.113/fs/nfsd/nfsxdr.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/nfsd/nfsxdr.c linux-4.4.115-vs2.3.9.7/fs/nfsd/nfsxdr.c +--- linux-4.4.115/fs/nfsd/nfsxdr.c 2018-02-10 14:38:47.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000 @@ -7,6 +7,7 @@ #include "vfs.h" #include "xdr.h" @@ -5212,9 +5212,9 @@ diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfsxdr.c linux-4.4.113-vs2.3.9.6/fs/ if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/dlmglue.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.c ---- linux-4.4.113/fs/ocfs2/dlmglue.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/dlmglue.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/dlmglue.c +--- linux-4.4.115/fs/ocfs2/dlmglue.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.000000000 +0000 @@ -2128,6 +2128,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)); @@ -5231,9 +5231,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/dlmglue.c linux-4.4.113-vs2.3.9.6/f 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-4.4.113/fs/ocfs2/dlmglue.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.h ---- linux-4.4.113/fs/ocfs2/dlmglue.h 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/dlmglue.h linux-4.4.115-vs2.3.9.7/fs/ocfs2/dlmglue.h +--- linux-4.4.115/fs/ocfs2/dlmglue.h 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5244,9 +5244,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/dlmglue.h linux-4.4.113-vs2.3.9.6/f }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/file.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/file.c ---- linux-4.4.113/fs/ocfs2/file.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/file.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/file.c +--- linux-4.4.115/fs/ocfs2/file.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000 @@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; @@ -5256,9 +5256,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/file.c linux-4.4.113-vs2.3.9.6/fs/o if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.c ---- linux-4.4.113/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/inode.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/inode.c +--- linux-4.4.115/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000 @@ -28,6 +28,7 @@ #include #include @@ -5355,9 +5355,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.c linux-4.4.113-vs2.3.9.6/fs/ /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.h ---- linux-4.4.113/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/inode.h linux-4.4.115-vs2.3.9.7/fs/ocfs2/inode.h +--- linux-4.4.115/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000 @@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i void ocfs2_set_inode_flags(struct inode *inode); @@ -5366,9 +5366,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/ static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/ioctl.c ---- linux-4.4.113/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/ioctl.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/ioctl.c +--- linux-4.4.115/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5432,9 +5432,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { struct inode *inode = file_inode(filp); -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/namei.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/namei.c ---- linux-4.4.113/fs/ocfs2/namei.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/namei.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/namei.c +--- linux-4.4.115/fs/ocfs2/namei.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000 @@ -41,6 +41,7 @@ #include #include @@ -5467,9 +5467,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/namei.c linux-4.4.113-vs2.3.9.6/fs/ 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-4.4.113/fs/ocfs2/ocfs2.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2.h ---- linux-4.4.113/fs/ocfs2/ocfs2.h 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/ocfs2.h linux-4.4.115-vs2.3.9.7/fs/ocfs2/ocfs2.h +--- linux-4.4.115/fs/ocfs2/ocfs2.h 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.000000000 +0000 @@ -289,6 +289,7 @@ enum ocfs2_mount_options OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */ OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */ @@ -5478,9 +5478,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ocfs2.h linux-4.4.113-vs2.3.9.6/fs/ }; #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ocfs2_fs.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2_fs.h ---- linux-4.4.113/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/ocfs2_fs.h linux-4.4.115-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h +--- linux-4.4.115/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.000000000 +0000 @@ -275,6 +275,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -5493,9 +5493,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ocfs2_fs.h linux-4.4.113-vs2.3.9.6/ #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-4.4.113/fs/ocfs2/super.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/super.c ---- linux-4.4.113/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/ocfs2/super.c linux-4.4.115-vs2.3.9.7/fs/ocfs2/super.c +--- linux-4.4.115/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000 @@ -193,6 +193,7 @@ enum { Opt_dir_resv_level, Opt_journal_async_commit, @@ -5559,9 +5559,9 @@ diff -NurpP --minimal linux-4.4.113/fs/ocfs2/super.c linux-4.4.113-vs2.3.9.6/fs/ default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-4.4.113/fs/open.c linux-4.4.113-vs2.3.9.6/fs/open.c ---- linux-4.4.113/fs/open.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/open.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/open.c linux-4.4.115-vs2.3.9.7/fs/open.c +--- linux-4.4.115/fs/open.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/open.c 2018-01-09 16:36:32.000000000 +0000 @@ -31,6 +31,11 @@ #include #include @@ -5629,9 +5629,9 @@ diff -NurpP --minimal linux-4.4.113/fs/open.c linux-4.4.113-vs2.3.9.6/fs/open.c error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-4.4.113/fs/proc/array.c linux-4.4.113-vs2.3.9.6/fs/proc/array.c ---- linux-4.4.113/fs/proc/array.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/array.c linux-4.4.115-vs2.3.9.7/fs/proc/array.c +--- linux-4.4.115/fs/proc/array.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000 @@ -83,6 +83,8 @@ #include #include @@ -5750,9 +5750,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/array.c linux-4.4.113-vs2.3.9.6/fs/p 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-4.4.113/fs/proc/base.c linux-4.4.113-vs2.3.9.6/fs/proc/base.c ---- linux-4.4.113/fs/proc/base.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/base.c linux-4.4.115-vs2.3.9.7/fs/proc/base.c +--- linux-4.4.115/fs/proc/base.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000 @@ -87,6 +87,8 @@ #include #include @@ -5890,9 +5890,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/base.c linux-4.4.113-vs2.3.9.6/fs/pr ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-4.4.113/fs/proc/generic.c linux-4.4.113-vs2.3.9.6/fs/proc/generic.c ---- linux-4.4.113/fs/proc/generic.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/generic.c linux-4.4.115-vs2.3.9.7/fs/proc/generic.c +--- linux-4.4.115/fs/proc/generic.c 2018-02-10 14:38:48.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -5967,9 +5967,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/generic.c linux-4.4.113-vs2.3.9.6/fs } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-4.4.113/fs/proc/inode.c linux-4.4.113-vs2.3.9.6/fs/proc/inode.c ---- linux-4.4.113/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/inode.c linux-4.4.115-vs2.3.9.7/fs/proc/inode.c +--- linux-4.4.115/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000 @@ -431,6 +431,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; @@ -5979,9 +5979,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/inode.c linux-4.4.113-vs2.3.9.6/fs/p if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-4.4.113/fs/proc/internal.h linux-4.4.113-vs2.3.9.6/fs/proc/internal.h ---- linux-4.4.113/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/internal.h linux-4.4.115-vs2.3.9.7/fs/proc/internal.h +--- linux-4.4.115/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000 @@ -14,6 +14,7 @@ #include #include @@ -6048,9 +6048,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/internal.h linux-4.4.113-vs2.3.9.6/f /* * base.c -diff -NurpP --minimal linux-4.4.113/fs/proc/loadavg.c linux-4.4.113-vs2.3.9.6/fs/proc/loadavg.c ---- linux-4.4.113/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/loadavg.c linux-4.4.115-vs2.3.9.7/fs/proc/loadavg.c +--- linux-4.4.115/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6080,9 +6080,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/loadavg.c linux-4.4.113-vs2.3.9.6/fs task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-4.4.113/fs/proc/meminfo.c linux-4.4.113-vs2.3.9.6/fs/proc/meminfo.c ---- linux-4.4.113/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/meminfo.c 2018-01-12 18:43:53.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/meminfo.c linux-4.4.115-vs2.3.9.7/fs/proc/meminfo.c +--- linux-4.4.115/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/meminfo.c 2018-01-12 18:43:53.000000000 +0000 @@ -43,7 +43,8 @@ static int meminfo_proc_show(struct seq_ si_swapinfo(&i); committed = percpu_counter_read_positive(&vm_committed_as); @@ -6112,9 +6112,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/meminfo.c linux-4.4.113-vs2.3.9.6/fs min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low); if (available < 0) -diff -NurpP --minimal linux-4.4.113/fs/proc/root.c linux-4.4.113-vs2.3.9.6/fs/proc/root.c ---- linux-4.4.113/fs/proc/root.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/root.c linux-4.4.115-vs2.3.9.7/fs/proc/root.c +--- linux-4.4.115/fs/proc/root.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000 @@ -20,9 +20,14 @@ #include #include @@ -6156,9 +6156,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/root.c linux-4.4.113-vs2.3.9.6/fs/pr .subdir = RB_ROOT, .name = "/proc", }; -diff -NurpP --minimal linux-4.4.113/fs/proc/self.c linux-4.4.113-vs2.3.9.6/fs/proc/self.c ---- linux-4.4.113/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/self.c linux-4.4.115-vs2.3.9.7/fs/proc/self.c +--- linux-4.4.115/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -6176,9 +6176,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/self.c linux-4.4.113-vs2.3.9.6/fs/pr if (inode) { inode->i_ino = self_inum; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; -diff -NurpP --minimal linux-4.4.113/fs/proc/stat.c linux-4.4.113-vs2.3.9.6/fs/proc/stat.c ---- linux-4.4.113/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/stat.c linux-4.4.115-vs2.3.9.7/fs/proc/stat.c +--- linux-4.4.115/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000 @@ -9,8 +9,10 @@ #include #include @@ -6227,9 +6227,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/stat.c linux-4.4.113-vs2.3.9.6/fs/pr /* 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-4.4.113/fs/proc/uptime.c linux-4.4.113-vs2.3.9.6/fs/proc/uptime.c ---- linux-4.4.113/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc/uptime.c linux-4.4.115-vs2.3.9.7/fs/proc/uptime.c +--- linux-4.4.115/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000 @@ -5,6 +5,7 @@ #include #include @@ -6249,9 +6249,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc/uptime.c linux-4.4.113-vs2.3.9.6/fs/ seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-4.4.113/fs/proc_namespace.c linux-4.4.113-vs2.3.9.6/fs/proc_namespace.c ---- linux-4.4.113/fs/proc_namespace.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/proc_namespace.c linux-4.4.115-vs2.3.9.7/fs/proc_namespace.c +--- linux-4.4.115/fs/proc_namespace.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000 @@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file { MS_DIRSYNC, ",dirsync" }, { MS_MANDLOCK, ",mand" }, @@ -6365,9 +6365,9 @@ diff -NurpP --minimal linux-4.4.113/fs/proc_namespace.c linux-4.4.113-vs2.3.9.6/ /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-4.4.113/fs/quota/dquot.c linux-4.4.113-vs2.3.9.6/fs/quota/dquot.c ---- linux-4.4.113/fs/quota/dquot.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/quota/dquot.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/quota/dquot.c linux-4.4.115-vs2.3.9.7/fs/quota/dquot.c +--- linux-4.4.115/fs/quota/dquot.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/quota/dquot.c 2018-02-10 15:16:50.000000000 +0000 @@ -1643,6 +1643,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; struct dquot **dquots; @@ -6406,9 +6406,9 @@ diff -NurpP --minimal linux-4.4.113/fs/quota/dquot.c linux-4.4.113-vs2.3.9.6/fs/ if (!dquot_active(inode)) return; -diff -NurpP --minimal linux-4.4.113/fs/quota/quota.c linux-4.4.113-vs2.3.9.6/fs/quota/quota.c ---- linux-4.4.113/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/quota/quota.c linux-4.4.115-vs2.3.9.7/fs/quota/quota.c +--- linux-4.4.115/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000 @@ -8,6 +8,7 @@ #include #include @@ -6496,9 +6496,9 @@ diff -NurpP --minimal linux-4.4.113/fs/quota/quota.c linux-4.4.113-vs2.3.9.6/fs/ if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-4.4.113/fs/stat.c linux-4.4.113-vs2.3.9.6/fs/stat.c ---- linux-4.4.113/fs/stat.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/stat.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/stat.c linux-4.4.115-vs2.3.9.7/fs/stat.c +--- linux-4.4.115/fs/stat.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/stat.c 2018-01-09 16:36:32.000000000 +0000 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6507,9 +6507,9 @@ diff -NurpP --minimal linux-4.4.113/fs/stat.c linux-4.4.113-vs2.3.9.6/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-4.4.113/fs/statfs.c linux-4.4.113-vs2.3.9.6/fs/statfs.c ---- linux-4.4.113/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/statfs.c linux-4.4.115-vs2.3.9.7/fs/statfs.c +--- linux-4.4.115/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000 @@ -7,6 +7,8 @@ #include #include @@ -6528,9 +6528,9 @@ diff -NurpP --minimal linux-4.4.113/fs/statfs.c linux-4.4.113-vs2.3.9.6/fs/statf return retval; } -diff -NurpP --minimal linux-4.4.113/fs/super.c linux-4.4.113-vs2.3.9.6/fs/super.c ---- linux-4.4.113/fs/super.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/super.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/super.c linux-4.4.115-vs2.3.9.7/fs/super.c +--- linux-4.4.115/fs/super.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/super.c 2018-01-09 16:36:32.000000000 +0000 @@ -33,6 +33,8 @@ #include #include @@ -6554,9 +6554,9 @@ diff -NurpP --minimal linux-4.4.113/fs/super.c linux-4.4.113-vs2.3.9.6/fs/super. error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-4.4.113/fs/utimes.c linux-4.4.113-vs2.3.9.6/fs/utimes.c ---- linux-4.4.113/fs/utimes.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/utimes.c linux-4.4.115-vs2.3.9.7/fs/utimes.c +--- linux-4.4.115/fs/utimes.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000 @@ -8,6 +8,8 @@ #include #include @@ -6587,9 +6587,9 @@ diff -NurpP --minimal linux-4.4.113/fs/utimes.c linux-4.4.113-vs2.3.9.6/fs/utime if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-4.4.113/fs/xattr.c linux-4.4.113-vs2.3.9.6/fs/xattr.c ---- linux-4.4.113/fs/xattr.c 2018-01-24 21:22:53.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/fs/xattr.c linux-4.4.115-vs2.3.9.7/fs/xattr.c +--- linux-4.4.115/fs/xattr.c 2018-02-10 14:38:49.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000 @@ -21,6 +21,7 @@ #include #include @@ -6607,9 +6607,9 @@ diff -NurpP --minimal linux-4.4.113/fs/xattr.c linux-4.4.113-vs2.3.9.6/fs/xattr. return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-4.4.113/include/linux/capability.h linux-4.4.113-vs2.3.9.6/include/linux/capability.h ---- linux-4.4.113/include/linux/capability.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/capability.h linux-4.4.115-vs2.3.9.7/include/linux/capability.h +--- linux-4.4.115/include/linux/capability.h 2018-02-10 14:38:52.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 @@ -77,7 +77,8 @@ extern const kernel_cap_t __cap_init_eff #else /* HAND-CODED capability initializers */ @@ -6620,9 +6620,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/capability.h linux-4.4.113-vs2 # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }}) # define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }}) -diff -NurpP --minimal linux-4.4.113/include/linux/cred.h linux-4.4.113-vs2.3.9.6/include/linux/cred.h ---- linux-4.4.113/include/linux/cred.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/cred.h 2018-01-11 08:03:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/cred.h linux-4.4.115-vs2.3.9.7/include/linux/cred.h +--- linux-4.4.115/include/linux/cred.h 2018-02-10 14:38:53.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/cred.h 2018-01-11 08:03:00.000000000 +0000 @@ -161,6 +161,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 *); @@ -6663,9 +6663,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/cred.h linux-4.4.113-vs2.3.9.6 /** * get_new_cred - Get a reference on a new set of credentials * @cred: The new credentials to reference -diff -NurpP --minimal linux-4.4.113/include/linux/dcache.h linux-4.4.113-vs2.3.9.6/include/linux/dcache.h ---- linux-4.4.113/include/linux/dcache.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/dcache.h linux-4.4.115-vs2.3.9.7/include/linux/dcache.h +--- linux-4.4.115/include/linux/dcache.h 2018-02-10 14:38:53.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000 @@ -10,6 +10,7 @@ #include #include @@ -6686,18 +6686,18 @@ diff -NurpP --minimal linux-4.4.113/include/linux/dcache.h linux-4.4.113-vs2.3.9 return dentry; } -diff -NurpP --minimal linux-4.4.113/include/linux/devpts_fs.h linux-4.4.113-vs2.3.9.6/include/linux/devpts_fs.h ---- linux-4.4.113/include/linux/devpts_fs.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/devpts_fs.h linux-4.4.115-vs2.3.9.7/include/linux/devpts_fs.h +--- linux-4.4.115/include/linux/devpts_fs.h 2018-02-10 14:38:53.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000 @@ -35,5 +35,4 @@ void devpts_pty_kill(struct inode *inode #endif - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/fs.h linux-4.4.113-vs2.3.9.6/include/linux/fs.h ---- linux-4.4.113/include/linux/fs.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/fs.h 2018-01-09 16:43:56.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/fs.h linux-4.4.115-vs2.3.9.7/include/linux/fs.h +--- linux-4.4.115/include/linux/fs.h 2018-02-10 14:38:53.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/fs.h 2018-01-09 16:43:56.000000000 +0000 @@ -227,6 +227,7 @@ typedef void (dax_iodone_t)(struct buffe #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ #define ATTR_TIMES_SET (1 << 16) @@ -6863,9 +6863,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/fs.h linux-4.4.113-vs2.3.9.6/i 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-4.4.113/include/linux/init_task.h linux-4.4.113-vs2.3.9.6/include/linux/init_task.h ---- linux-4.4.113/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/init_task.h linux-4.4.115-vs2.3.9.7/include/linux/init_task.h +--- linux-4.4.115/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000 @@ -260,6 +260,10 @@ extern struct task_group root_task_group INIT_VTIME(tsk) \ INIT_NUMA_BALANCING(tsk) \ @@ -6877,9 +6877,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/init_task.h linux-4.4.113-vs2. } -diff -NurpP --minimal linux-4.4.113/include/linux/ipc.h linux-4.4.113-vs2.3.9.6/include/linux/ipc.h ---- linux-4.4.113/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/ipc.h linux-4.4.115-vs2.3.9.7/include/linux/ipc.h +--- linux-4.4.115/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; @@ -6888,9 +6888,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/ipc.h linux-4.4.113-vs2.3.9.6/ kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-4.4.113/include/linux/memcontrol.h linux-4.4.113-vs2.3.9.6/include/linux/memcontrol.h ---- linux-4.4.113/include/linux/memcontrol.h 2018-01-24 21:22:56.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/memcontrol.h 2018-01-24 22:44:17.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/memcontrol.h linux-4.4.115-vs2.3.9.7/include/linux/memcontrol.h +--- linux-4.4.115/include/linux/memcontrol.h 2018-02-10 14:38:53.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/memcontrol.h 2018-01-24 22:44:17.000000000 +0000 @@ -113,6 +113,7 @@ struct cg_proto { struct mem_cgroup *memcg; }; @@ -6912,9 +6912,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/memcontrol.h linux-4.4.113-vs2 static inline bool mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *memcg) { -diff -NurpP --minimal linux-4.4.113/include/linux/mount.h linux-4.4.113-vs2.3.9.6/include/linux/mount.h ---- linux-4.4.113/include/linux/mount.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/mount.h linux-4.4.115-vs2.3.9.7/include/linux/mount.h +--- linux-4.4.115/include/linux/mount.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000 @@ -63,6 +63,9 @@ struct mnt_namespace; #define MNT_MARKED 0x4000000 #define MNT_UMOUNT 0x8000000 @@ -6925,9 +6925,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/mount.h linux-4.4.113-vs2.3.9. struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-4.4.113/include/linux/net.h linux-4.4.113-vs2.3.9.6/include/linux/net.h ---- linux-4.4.113/include/linux/net.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/net.h linux-4.4.115-vs2.3.9.7/include/linux/net.h +--- linux-4.4.115/include/linux/net.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000 @@ -43,6 +43,7 @@ struct net; #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 @@ -6936,9 +6936,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/net.h linux-4.4.113-vs2.3.9.6/ #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-4.4.113/include/linux/netdevice.h linux-4.4.113-vs2.3.9.6/include/linux/netdevice.h ---- linux-4.4.113/include/linux/netdevice.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/netdevice.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/netdevice.h linux-4.4.115-vs2.3.9.7/include/linux/netdevice.h +--- linux-4.4.115/include/linux/netdevice.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/netdevice.h 2018-01-09 16:36:32.000000000 +0000 @@ -2296,6 +2296,7 @@ static inline int dev_recursion_level(vo struct net_device *dev_get_by_index(struct net *net, int ifindex); @@ -6947,9 +6947,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/netdevice.h linux-4.4.113-vs2. 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-4.4.113/include/linux/nsproxy.h linux-4.4.113-vs2.3.9.6/include/linux/nsproxy.h ---- linux-4.4.113/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/nsproxy.h linux-4.4.115-vs2.3.9.7/include/linux/nsproxy.h +--- linux-4.4.115/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000 @@ -3,6 +3,7 @@ #include @@ -6999,9 +6999,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/nsproxy.h linux-4.4.113-vs2.3. } #endif -diff -NurpP --minimal linux-4.4.113/include/linux/pid.h linux-4.4.113-vs2.3.9.6/include/linux/pid.h ---- linux-4.4.113/include/linux/pid.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/pid.h linux-4.4.115-vs2.3.9.7/include/linux/pid.h +--- linux-4.4.115/include/linux/pid.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000 @@ -10,7 +10,8 @@ enum pid_type PIDTYPE_SID, PIDTYPE_MAX, @@ -7020,9 +7020,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/pid.h linux-4.4.113-vs2.3.9.6/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-4.4.113/include/linux/quotaops.h linux-4.4.113-vs2.3.9.6/include/linux/quotaops.h ---- linux-4.4.113/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/quotaops.h linux-4.4.115-vs2.3.9.7/include/linux/quotaops.h +--- linux-4.4.115/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -7064,10 +7064,10 @@ diff -NurpP --minimal linux-4.4.113/include/linux/quotaops.h linux-4.4.113-vs2.3 } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-4.4.113/include/linux/sched.h linux-4.4.113-vs2.3.9.6/include/linux/sched.h ---- linux-4.4.113/include/linux/sched.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/sched.h 2018-01-09 16:36:32.000000000 +0000 -@@ -1600,6 +1600,14 @@ struct task_struct { +diff -NurpP --minimal linux-4.4.115/include/linux/sched.h linux-4.4.115-vs2.3.9.7/include/linux/sched.h +--- linux-4.4.115/include/linux/sched.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/sched.h 2018-02-10 15:16:50.000000000 +0000 +@@ -1601,6 +1601,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -7082,7 +7082,7 @@ diff -NurpP --minimal linux-4.4.113/include/linux/sched.h linux-4.4.113-vs2.3.9. /* Thread group tracking */ u32 parent_exec_id; u32 self_exec_id; -@@ -1927,6 +1935,11 @@ struct pid_namespace; +@@ -1928,6 +1936,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -7094,7 +7094,7 @@ diff -NurpP --minimal linux-4.4.113/include/linux/sched.h linux-4.4.113-vs2.3.9. static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1940,7 +1953,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -1941,7 +1954,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -7104,9 +7104,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/sched.h linux-4.4.113-vs2.3.9. } -diff -NurpP --minimal linux-4.4.113/include/linux/shmem_fs.h linux-4.4.113-vs2.3.9.6/include/linux/shmem_fs.h ---- linux-4.4.113/include/linux/shmem_fs.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/shmem_fs.h linux-4.4.115-vs2.3.9.7/include/linux/shmem_fs.h +--- linux-4.4.115/include/linux/shmem_fs.h 2018-02-10 14:38:54.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000 @@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -7117,9 +7117,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/shmem_fs.h linux-4.4.113-vs2.3 struct shmem_inode_info { spinlock_t lock; unsigned int seals; /* shmem seals */ -diff -NurpP --minimal linux-4.4.113/include/linux/stat.h linux-4.4.113-vs2.3.9.6/include/linux/stat.h ---- linux-4.4.113/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/stat.h linux-4.4.115-vs2.3.9.7/include/linux/stat.h +--- linux-4.4.115/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; @@ -7128,9 +7128,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/stat.h linux-4.4.113-vs2.3.9.6 dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/auth.h linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/auth.h ---- linux-4.4.113/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/sunrpc/auth.h linux-4.4.115-vs2.3.9.7/include/linux/sunrpc/auth.h +--- linux-4.4.115/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000 @@ -40,6 +40,7 @@ enum { struct auth_cred { kuid_t uid; @@ -7139,9 +7139,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/auth.h linux-4.4.113-vs struct group_info *group_info; const char *principal; unsigned long ac_flags; -diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/clnt.h linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/clnt.h ---- linux-4.4.113/include/linux/sunrpc/clnt.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/sunrpc/clnt.h linux-4.4.115-vs2.3.9.7/include/linux/sunrpc/clnt.h +--- linux-4.4.115/include/linux/sunrpc/clnt.h 2018-02-10 14:38:55.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000 @@ -51,7 +51,8 @@ struct rpc_clnt { cl_discrtry : 1,/* disconnect before retry */ cl_noretranstimeo: 1,/* No retransmit timeouts */ @@ -7152,9 +7152,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/clnt.h linux-4.4.113-vs struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-4.4.113/include/linux/types.h linux-4.4.113-vs2.3.9.6/include/linux/types.h ---- linux-4.4.113/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/types.h linux-4.4.115-vs2.3.9.7/include/linux/types.h +--- linux-4.4.115/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; @@ -7165,9 +7165,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/types.h linux-4.4.113-vs2.3.9. typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-4.4.113/include/linux/uidgid.h linux-4.4.113-vs2.3.9.6/include/linux/uidgid.h ---- linux-4.4.113/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/uidgid.h linux-4.4.115-vs2.3.9.7/include/linux/uidgid.h +--- linux-4.4.115/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000 @@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -7264,9 +7264,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/uidgid.h linux-4.4.113-vs2.3.9 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-4.4.113/include/linux/vroot.h linux-4.4.113-vs2.3.9.6/include/linux/vroot.h ---- linux-4.4.113/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vroot.h linux-4.4.115-vs2.3.9.7/include/linux/vroot.h +--- linux-4.4.115/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,51 @@ + +/* @@ -7319,9 +7319,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vroot.h linux-4.4.113-vs2.3.9. +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vs_base.h linux-4.4.113-vs2.3.9.6/include/linux/vs_base.h ---- linux-4.4.113/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_base.h linux-4.4.115-vs2.3.9.7/include/linux/vs_base.h +--- linux-4.4.115/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -7333,9 +7333,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_base.h linux-4.4.113-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_context.h linux-4.4.113-vs2.3.9.6/include/linux/vs_context.h ---- linux-4.4.113/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_context.h linux-4.4.115-vs2.3.9.7/include/linux/vs_context.h +--- linux-4.4.115/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -7579,9 +7579,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_context.h linux-4.4.113-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_cowbl.h linux-4.4.113-vs2.3.9.6/include/linux/vs_cowbl.h ---- linux-4.4.113/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_cowbl.h linux-4.4.115-vs2.3.9.7/include/linux/vs_cowbl.h +--- linux-4.4.115/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -7631,9 +7631,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_cowbl.h linux-4.4.113-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_cvirt.h linux-4.4.113-vs2.3.9.6/include/linux/vs_cvirt.h ---- linux-4.4.113/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_cvirt.h linux-4.4.115-vs2.3.9.7/include/linux/vs_cvirt.h +--- linux-4.4.115/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -7685,9 +7685,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_cvirt.h linux-4.4.113-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_device.h linux-4.4.113-vs2.3.9.6/include/linux/vs_device.h ---- linux-4.4.113/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_device.h linux-4.4.115-vs2.3.9.7/include/linux/vs_device.h +--- linux-4.4.115/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -7734,9 +7734,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_device.h linux-4.4.113-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_dlimit.h linux-4.4.113-vs2.3.9.6/include/linux/vs_dlimit.h ---- linux-4.4.113/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_dlimit.h linux-4.4.115-vs2.3.9.7/include/linux/vs_dlimit.h +--- linux-4.4.115/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -7953,9 +7953,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_dlimit.h linux-4.4.113-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet.h linux-4.4.113-vs2.3.9.6/include/linux/vs_inet.h ---- linux-4.4.113/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_inet.h linux-4.4.115-vs2.3.9.7/include/linux/vs_inet.h +--- linux-4.4.115/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H @@ -8321,9 +8321,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet.h linux-4.4.113-vs2.3. +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet6.h linux-4.4.113-vs2.3.9.6/include/linux/vs_inet6.h ---- linux-4.4.113/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_inet6.h linux-4.4.115-vs2.3.9.7/include/linux/vs_inet6.h +--- linux-4.4.115/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,257 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H @@ -8582,9 +8582,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet6.h linux-4.4.113-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_limit.h linux-4.4.113-vs2.3.9.6/include/linux/vs_limit.h ---- linux-4.4.113/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_limit.h linux-4.4.115-vs2.3.9.7/include/linux/vs_limit.h +--- linux-4.4.115/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -8726,9 +8726,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_limit.h linux-4.4.113-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_network.h linux-4.4.113-vs2.3.9.6/include/linux/vs_network.h ---- linux-4.4.113/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_network.h linux-4.4.115-vs2.3.9.7/include/linux/vs_network.h +--- linux-4.4.115/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -8899,9 +8899,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_network.h linux-4.4.113-vs2 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_pid.h linux-4.4.113-vs2.3.9.6/include/linux/vs_pid.h ---- linux-4.4.113/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_pid.h linux-4.4.115-vs2.3.9.7/include/linux/vs_pid.h +--- linux-4.4.115/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -8953,9 +8953,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_pid.h linux-4.4.113-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_sched.h linux-4.4.113-vs2.3.9.6/include/linux/vs_sched.h ---- linux-4.4.113/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_sched.h linux-4.4.115-vs2.3.9.7/include/linux/vs_sched.h +--- linux-4.4.115/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -8997,9 +8997,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_sched.h linux-4.4.113-vs2.3 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_socket.h linux-4.4.113-vs2.3.9.6/include/linux/vs_socket.h ---- linux-4.4.113/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_socket.h linux-4.4.115-vs2.3.9.7/include/linux/vs_socket.h +--- linux-4.4.115/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -9068,9 +9068,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_socket.h linux-4.4.113-vs2. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_tag.h linux-4.4.113-vs2.3.9.6/include/linux/vs_tag.h ---- linux-4.4.113/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_tag.h linux-4.4.115-vs2.3.9.7/include/linux/vs_tag.h +--- linux-4.4.115/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -9119,9 +9119,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_tag.h linux-4.4.113-vs2.3.9 +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vs_time.h linux-4.4.113-vs2.3.9.6/include/linux/vs_time.h ---- linux-4.4.113/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vs_time.h linux-4.4.115-vs2.3.9.7/include/linux/vs_time.h +--- linux-4.4.115/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H @@ -9142,9 +9142,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vs_time.h linux-4.4.113-vs2.3. +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/base.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/base.h ---- linux-4.4.113/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/base.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/base.h +--- linux-4.4.115/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,184 @@ +#ifndef _VSERVER_BASE_H +#define _VSERVER_BASE_H @@ -9330,9 +9330,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/base.h linux-4.4.113-v +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct.h ---- linux-4.4.113/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cacct.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct.h +--- linux-4.4.115/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _VSERVER_CACCT_H +#define _VSERVER_CACCT_H @@ -9349,9 +9349,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct.h linux-4.4.113- +}; + +#endif /* _VSERVER_CACCT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_cmd.h ---- linux-4.4.113/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cacct_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_cmd.h +--- linux-4.4.115/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_CACCT_CMD_H +#define _VSERVER_CACCT_CMD_H @@ -9363,9 +9363,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_cmd.h linux-4.4. +extern int vc_sock_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CACCT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_def.h ---- linux-4.4.113/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cacct_def.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_def.h +--- linux-4.4.115/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef _VSERVER_CACCT_DEF_H +#define _VSERVER_CACCT_DEF_H @@ -9410,9 +9410,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CACCT_DEF_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_int.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_int.h ---- linux-4.4.113/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cacct_int.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_int.h +--- linux-4.4.115/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_CACCT_INT_H +#define _VSERVER_CACCT_INT_H @@ -9431,9 +9431,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_int.h linux-4.4. +} + +#endif /* _VSERVER_CACCT_INT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/check.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/check.h ---- linux-4.4.113/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/check.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/check.h +--- linux-4.4.115/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,89 @@ +#ifndef _VSERVER_CHECK_H +#define _VSERVER_CHECK_H @@ -9524,9 +9524,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/check.h linux-4.4.113- +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/context.h ---- linux-4.4.113/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/context.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/context.h +--- linux-4.4.115/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,110 @@ +#ifndef _VSERVER_CONTEXT_H +#define _VSERVER_CONTEXT_H @@ -9638,9 +9638,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context.h linux-4.4.11 + + +#endif /* _VSERVER_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/context_cmd.h ---- linux-4.4.113/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/context_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/context_cmd.h +--- linux-4.4.115/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,33 @@ +#ifndef _VSERVER_CONTEXT_CMD_H +#define _VSERVER_CONTEXT_CMD_H @@ -9675,9 +9675,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context_cmd.h linux-4. +extern int vc_set_badness(struct vx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt.h ---- linux-4.4.113/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cvirt.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt.h +--- linux-4.4.115/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,18 @@ +#ifndef _VSERVER_CVIRT_H +#define _VSERVER_CVIRT_H @@ -9697,9 +9697,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt.h linux-4.4.113- +int vx_do_syslog(int, char __user *, int); + +#endif /* _VSERVER_CVIRT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_cmd.h ---- linux-4.4.113/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cvirt_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h +--- linux-4.4.115/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_CVIRT_CMD_H +#define _VSERVER_CVIRT_CMD_H @@ -9714,9 +9714,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_cmd.h linux-4.4. +extern int vc_virt_stat(struct vx_info *, void __user *); + +#endif /* _VSERVER_CVIRT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_def.h ---- linux-4.4.113/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/cvirt_def.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt_def.h +--- linux-4.4.115/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef _VSERVER_CVIRT_DEF_H +#define _VSERVER_CVIRT_DEF_H @@ -9798,9 +9798,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_def.h linux-4.4. +#endif + +#endif /* _VSERVER_CVIRT_DEF_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug.h ---- linux-4.4.113/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/debug.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/debug.h +--- linux-4.4.115/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,146 @@ +#ifndef _VSERVER_DEBUG_H +#define _VSERVER_DEBUG_H @@ -9948,9 +9948,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug.h linux-4.4.113- + + +#endif /* _VSERVER_DEBUG_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug_cmd.h ---- linux-4.4.113/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/debug_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/debug_cmd.h +--- linux-4.4.115/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_DEBUG_CMD_H +#define _VSERVER_DEBUG_CMD_H @@ -9989,9 +9989,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device.h ---- linux-4.4.113/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/device.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/device.h +--- linux-4.4.115/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,9 @@ +#ifndef _VSERVER_DEVICE_H +#define _VSERVER_DEVICE_H @@ -10002,9 +10002,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device.h linux-4.4.113 +#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DEVICE_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_cmd.h ---- linux-4.4.113/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/device_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/device_cmd.h +--- linux-4.4.115/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _VSERVER_DEVICE_CMD_H +#define _VSERVER_DEVICE_CMD_H @@ -10037,9 +10037,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_def.h ---- linux-4.4.113/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/device_def.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/device_def.h +--- linux-4.4.115/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,17 @@ +#ifndef _VSERVER_DEVICE_DEF_H +#define _VSERVER_DEVICE_DEF_H @@ -10058,9 +10058,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_def.h linux-4.4 +}; + +#endif /* _VSERVER_DEVICE_DEF_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit.h ---- linux-4.4.113/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/dlimit.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/dlimit.h +--- linux-4.4.115/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,54 @@ +#ifndef _VSERVER_DLIMIT_H +#define _VSERVER_DLIMIT_H @@ -10116,9 +10116,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit.h linux-4.4.113 +#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion +#endif /* _VSERVER_DLIMIT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit_cmd.h ---- linux-4.4.113/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/dlimit_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h +--- linux-4.4.115/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,46 @@ +#ifndef _VSERVER_DLIMIT_CMD_H +#define _VSERVER_DLIMIT_CMD_H @@ -10166,9 +10166,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit_cmd.h linux-4.4 +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/global.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/global.h ---- linux-4.4.113/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/global.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/global.h +--- linux-4.4.115/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_GLOBAL_H +#define _VSERVER_GLOBAL_H @@ -10189,9 +10189,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/global.h linux-4.4.113 + + +#endif /* _VSERVER_GLOBAL_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/history.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/history.h ---- linux-4.4.113/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/history.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/history.h +--- linux-4.4.115/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,197 @@ +#ifndef _VSERVER_HISTORY_H +#define _VSERVER_HISTORY_H @@ -10390,9 +10390,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/history.h linux-4.4.11 +#endif /* CONFIG_VSERVER_HISTORY */ + +#endif /* _VSERVER_HISTORY_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode.h ---- linux-4.4.113/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/inode.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/inode.h +--- linux-4.4.115/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,19 @@ +#ifndef _VSERVER_INODE_H +#define _VSERVER_INODE_H @@ -10413,9 +10413,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode.h linux-4.4.113- +#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_INODE_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode_cmd.h ---- linux-4.4.113/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/inode_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/inode_cmd.h +--- linux-4.4.115/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,36 @@ +#ifndef _VSERVER_INODE_CMD_H +#define _VSERVER_INODE_CMD_H @@ -10453,9 +10453,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode_cmd.h linux-4.4. +#endif /* CONFIG_COMPAT */ + +#endif /* _VSERVER_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit.h ---- linux-4.4.113/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/limit.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit.h +--- linux-4.4.115/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _VSERVER_LIMIT_H +#define _VSERVER_LIMIT_H @@ -10524,9 +10524,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit.h linux-4.4.113- +#define NUM_LIMITS 24 + +#endif /* _VSERVER_LIMIT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_cmd.h ---- linux-4.4.113/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/limit_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_cmd.h +--- linux-4.4.115/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,35 @@ +#ifndef _VSERVER_LIMIT_CMD_H +#define _VSERVER_LIMIT_CMD_H @@ -10563,9 +10563,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_cmd.h linux-4.4. +#endif /* CONFIG_IA32_EMULATION */ + +#endif /* _VSERVER_LIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_def.h ---- linux-4.4.113/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/limit_def.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_def.h +--- linux-4.4.115/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,47 @@ +#ifndef _VSERVER_LIMIT_DEF_H +#define _VSERVER_LIMIT_DEF_H @@ -10614,9 +10614,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_def.h linux-4.4. +#endif + +#endif /* _VSERVER_LIMIT_DEF_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_int.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_int.h ---- linux-4.4.113/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/limit_int.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_int.h +--- linux-4.4.115/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,193 @@ +#ifndef _VSERVER_LIMIT_INT_H +#define _VSERVER_LIMIT_INT_H @@ -10811,9 +10811,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_int.h linux-4.4. + + +#endif /* _VSERVER_LIMIT_INT_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/monitor.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/monitor.h ---- linux-4.4.113/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/monitor.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/monitor.h +--- linux-4.4.115/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,6 @@ +#ifndef _VSERVER_MONITOR_H +#define _VSERVER_MONITOR_H @@ -10821,9 +10821,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/monitor.h linux-4.4.11 +#include + +#endif /* _VSERVER_MONITOR_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/network.h ---- linux-4.4.113/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/network.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/network.h +--- linux-4.4.115/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _VSERVER_NETWORK_H +#define _VSERVER_NETWORK_H @@ -10901,9 +10901,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network.h linux-4.4.11 +#endif + +#endif /* _VSERVER_NETWORK_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/network_cmd.h ---- linux-4.4.113/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/network_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/network_cmd.h +--- linux-4.4.115/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef _VSERVER_NETWORK_CMD_H +#define _VSERVER_NETWORK_CMD_H @@ -10942,9 +10942,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network_cmd.h linux-4. +extern int vc_set_ncaps(struct nx_info *, void __user *); + +#endif /* _VSERVER_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/percpu.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/percpu.h ---- linux-4.4.113/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/percpu.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/percpu.h +--- linux-4.4.115/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_PERCPU_H +#define _VSERVER_PERCPU_H @@ -10960,9 +10960,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/percpu.h linux-4.4.113 +#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) + +#endif /* _VSERVER_PERCPU_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/pid.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/pid.h ---- linux-4.4.113/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/pid.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/pid.h +--- linux-4.4.115/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,51 @@ +#ifndef _VSERVER_PID_H +#define _VSERVER_PID_H @@ -11015,9 +11015,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/pid.h linux-4.4.113-vs +} + +#endif -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched.h ---- linux-4.4.113/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/sched.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched.h +--- linux-4.4.115/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _VSERVER_SCHED_H +#define _VSERVER_SCHED_H @@ -11042,9 +11042,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched.h linux-4.4.113- +#else /* _VSERVER_SCHED_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SCHED_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_cmd.h ---- linux-4.4.113/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/sched_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched_cmd.h +--- linux-4.4.115/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,11 @@ +#ifndef _VSERVER_SCHED_CMD_H +#define _VSERVER_SCHED_CMD_H @@ -11057,9 +11057,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_cmd.h linux-4.4. +extern int vc_get_prio_bias(struct vx_info *, void __user *); + +#endif /* _VSERVER_SCHED_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_def.h ---- linux-4.4.113/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/sched_def.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched_def.h +--- linux-4.4.115/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,38 @@ +#ifndef _VSERVER_SCHED_DEF_H +#define _VSERVER_SCHED_DEF_H @@ -11099,9 +11099,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_def.h linux-4.4. +#endif + +#endif /* _VSERVER_SCHED_DEF_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal.h ---- linux-4.4.113/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/signal.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/signal.h +--- linux-4.4.115/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_H +#define _VSERVER_SIGNAL_H @@ -11117,9 +11117,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal.h linux-4.4.113 +#else /* _VSERVER_SIGNAL_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SIGNAL_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal_cmd.h ---- linux-4.4.113/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/signal_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/signal_cmd.h +--- linux-4.4.115/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _VSERVER_SIGNAL_CMD_H +#define _VSERVER_SIGNAL_CMD_H @@ -11135,9 +11135,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal_cmd.h linux-4.4 +extern int vc_set_pflags(uint32_t pid, void __user *); + +#endif /* _VSERVER_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/space.h ---- linux-4.4.113/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/space.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/space.h +--- linux-4.4.115/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _VSERVER_SPACE_H +#define _VSERVER_SPACE_H @@ -11151,9 +11151,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space.h linux-4.4.113- +#else /* _VSERVER_SPACE_H */ +#warning duplicate inclusion +#endif /* _VSERVER_SPACE_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/space_cmd.h ---- linux-4.4.113/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/space_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/space_cmd.h +--- linux-4.4.115/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _VSERVER_SPACE_CMD_H +#define _VSERVER_SPACE_CMD_H @@ -11168,9 +11168,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space_cmd.h linux-4.4. +extern int vc_get_space_mask(void __user *, int); + +#endif /* _VSERVER_SPACE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/switch.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/switch.h ---- linux-4.4.113/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/switch.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/switch.h +--- linux-4.4.115/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,8 @@ +#ifndef _VSERVER_SWITCH_H +#define _VSERVER_SWITCH_H @@ -11180,9 +11180,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/switch.h linux-4.4.113 +#include + +#endif /* _VSERVER_SWITCH_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag.h ---- linux-4.4.113/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/tag.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/tag.h +--- linux-4.4.115/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,160 @@ +#ifndef _DX_TAG_H +#define _DX_TAG_H @@ -11344,9 +11344,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag.h linux-4.4.113-vs +#endif + +#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag_cmd.h ---- linux-4.4.113/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/linux/vserver/tag_cmd.h linux-4.4.115-vs2.3.9.7/include/linux/vserver/tag_cmd.h +--- linux-4.4.115/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000 @@ -0,0 +1,10 @@ +#ifndef _VSERVER_TAG_CMD_H +#define _VSERVER_TAG_CMD_H @@ -11358,9 +11358,9 @@ diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag_cmd.h linux-4.4.11 +extern int vc_tag_migrate(uint32_t); + +#endif /* _VSERVER_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/net/addrconf.h linux-4.4.113-vs2.3.9.6/include/net/addrconf.h ---- linux-4.4.113/include/net/addrconf.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/addrconf.h linux-4.4.115-vs2.3.9.7/include/net/addrconf.h +--- linux-4.4.115/include/net/addrconf.h 2018-02-10 14:38:55.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000 @@ -84,7 +84,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, @@ -11370,9 +11370,9 @@ diff -NurpP --minimal linux-4.4.113/include/net/addrconf.h linux-4.4.113-vs2.3.9 int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, u32 banned_flags); int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, -diff -NurpP --minimal linux-4.4.113/include/net/af_unix.h linux-4.4.113-vs2.3.9.6/include/net/af_unix.h ---- linux-4.4.113/include/net/af_unix.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/af_unix.h linux-4.4.115-vs2.3.9.7/include/net/af_unix.h +--- linux-4.4.115/include/net/af_unix.h 2018-02-10 14:38:55.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -11381,9 +11381,9 @@ diff -NurpP --minimal linux-4.4.113/include/net/af_unix.h linux-4.4.113-vs2.3.9. #include void unix_inflight(struct user_struct *user, struct file *fp); -diff -NurpP --minimal linux-4.4.113/include/net/inet_timewait_sock.h linux-4.4.113-vs2.3.9.6/include/net/inet_timewait_sock.h ---- linux-4.4.113/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/inet_timewait_sock.h linux-4.4.115-vs2.3.9.7/include/net/inet_timewait_sock.h +--- linux-4.4.115/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000 @@ -71,6 +71,10 @@ struct inet_timewait_sock { #define tw_num __tw_common.skc_num #define tw_cookie __tw_common.skc_cookie @@ -11395,9 +11395,9 @@ diff -NurpP --minimal linux-4.4.113/include/net/inet_timewait_sock.h linux-4.4.1 int tw_timeout; volatile unsigned char tw_substate; -diff -NurpP --minimal linux-4.4.113/include/net/ip6_route.h linux-4.4.113-vs2.3.9.6/include/net/ip6_route.h ---- linux-4.4.113/include/net/ip6_route.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/ip6_route.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/ip6_route.h linux-4.4.115-vs2.3.9.7/include/net/ip6_route.h +--- linux-4.4.115/include/net/ip6_route.h 2018-02-10 14:38:55.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/ip6_route.h 2018-01-09 16:36:32.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, @@ -11407,9 +11407,9 @@ diff -NurpP --minimal linux-4.4.113/include/net/ip6_route.h linux-4.4.113-vs2.3. 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-4.4.113/include/net/route.h linux-4.4.113-vs2.3.9.6/include/net/route.h ---- linux-4.4.113/include/net/route.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/route.h 2018-01-09 16:39:47.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/route.h linux-4.4.115-vs2.3.9.7/include/net/route.h +--- linux-4.4.115/include/net/route.h 2016-07-05 04:15:11.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/route.h 2018-01-09 16:39:47.000000000 +0000 @@ -223,6 +223,9 @@ static inline void ip_rt_put(struct rtab dst_release(&rt->dst); } @@ -11461,9 +11461,9 @@ diff -NurpP --minimal linux-4.4.113/include/net/route.h linux-4.4.113-vs2.3.9.6/ rt = __ip_route_output_key(net, fl4); if (IS_ERR(rt)) return rt; -diff -NurpP --minimal linux-4.4.113/include/net/sock.h linux-4.4.113-vs2.3.9.6/include/net/sock.h ---- linux-4.4.113/include/net/sock.h 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/net/sock.h linux-4.4.115-vs2.3.9.7/include/net/sock.h +--- linux-4.4.115/include/net/sock.h 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000 @@ -201,6 +201,10 @@ struct sock_common { struct in6_addr skc_v6_daddr; struct in6_addr skc_v6_rcv_saddr; @@ -11489,17 +11489,17 @@ diff -NurpP --minimal linux-4.4.113/include/net/sock.h linux-4.4.113-vs2.3.9.6/i #define sk_incoming_cpu __sk_common.skc_incoming_cpu #define sk_flags __sk_common.skc_flags #define sk_rxhash __sk_common.skc_rxhash -diff -NurpP --minimal linux-4.4.113/include/uapi/Kbuild linux-4.4.113-vs2.3.9.6/include/uapi/Kbuild ---- linux-4.4.113/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/Kbuild linux-4.4.115-vs2.3.9.7/include/uapi/Kbuild +--- linux-4.4.115/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000 @@ -13,3 +13,4 @@ header-y += drm/ header-y += xen/ header-y += scsi/ header-y += misc/ +header-y += vserver/ -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/capability.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/capability.h ---- linux-4.4.113/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/capability.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/capability.h +--- linux-4.4.115/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000 @@ -259,6 +259,7 @@ struct vfs_cap_data { arbitrary SCSI commands */ /* Allow setting encryption key on loopback filesystem */ @@ -11522,9 +11522,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/capability.h linux-4.4.11 /* * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/fs.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/fs.h ---- linux-4.4.113/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/fs.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/fs.h +--- linux-4.4.115/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000 @@ -91,6 +91,9 @@ struct inodes_stat_t { #define MS_I_VERSION (1<<23) /* Update inode I_version field */ #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ @@ -11554,9 +11554,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/fs.h linux-4.4.113-vs2.3. #define SYNC_FILE_RANGE_WAIT_BEFORE 1 #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/gfs2_ondisk.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/gfs2_ondisk.h ---- linux-4.4.113/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/gfs2_ondisk.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h +--- linux-4.4.115/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000 @@ -225,6 +225,9 @@ enum { gfs2fl_Sync = 8, gfs2fl_System = 9, @@ -11577,9 +11577,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/gfs2_ondisk.h linux-4.4.1 #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-4.4.113/include/uapi/linux/if_tun.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/if_tun.h ---- linux-4.4.113/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/if_tun.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/if_tun.h +--- linux-4.4.115/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000 @@ -56,6 +56,7 @@ */ #define TUNSETVNETBE _IOW('T', 222, int) @@ -11588,9 +11588,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/if_tun.h linux-4.4.113-vs /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/major.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/major.h ---- linux-4.4.113/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/major.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/major.h +--- linux-4.4.115/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000 @@ -15,6 +15,7 @@ #define HD_MAJOR IDE0_MAJOR #define PTY_SLAVE_MAJOR 3 @@ -11599,9 +11599,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/major.h linux-4.4.113-vs2 #define TTYAUX_MAJOR 5 #define LP_MAJOR 6 #define VCS_MAJOR 7 -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/nfs_mount.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/nfs_mount.h ---- linux-4.4.113/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/nfs_mount.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/nfs_mount.h +--- linux-4.4.115/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.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 */ @@ -11612,9 +11612,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/nfs_mount.h linux-4.4.113 /* The following are for internal use only */ #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/reboot.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/reboot.h ---- linux-4.4.113/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/reboot.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/reboot.h +--- linux-4.4.115/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000 @@ -33,7 +33,7 @@ #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 @@ -11624,9 +11624,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/reboot.h linux-4.4.113-vs #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/linux/sysctl.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/sysctl.h ---- linux-4.4.113/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/linux/sysctl.h linux-4.4.115-vs2.3.9.7/include/uapi/linux/sysctl.h +--- linux-4.4.115/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000 @@ -60,6 +60,7 @@ enum CTL_ABI=9, /* Binary emulation */ CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ @@ -11643,9 +11643,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/linux/sysctl.h linux-4.4.113-vs KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/Kbuild linux-4.4.113-vs2.3.9.6/include/uapi/vserver/Kbuild ---- linux-4.4.113/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/Kbuild linux-4.4.115-vs2.3.9.7/include/uapi/vserver/Kbuild +--- linux-4.4.115/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,9 @@ + +header-y += context_cmd.h network_cmd.h space_cmd.h \ @@ -11656,9 +11656,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/Kbuild linux-4.4.113-vs +header-y += switch.h context.h network.h monitor.h \ + limit.h inode.h device.h + -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cacct_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cacct_cmd.h ---- linux-4.4.113/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/cacct_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h +--- linux-4.4.115/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,15 @@ +#ifndef _UAPI_VS_CACCT_CMD_H +#define _UAPI_VS_CACCT_CMD_H @@ -11675,9 +11675,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cacct_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CACCT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context.h ---- linux-4.4.113/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/context.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/context.h +--- linux-4.4.115/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,81 @@ +#ifndef _UAPI_VS_CONTEXT_H +#define _UAPI_VS_CONTEXT_H @@ -11760,9 +11760,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context.h linux-4.4.113 +#define VXC_NAMESPACE 0x02000000 + +#endif /* _UAPI_VS_CONTEXT_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context_cmd.h ---- linux-4.4.113/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/context_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/context_cmd.h +--- linux-4.4.115/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,115 @@ +#ifndef _UAPI_VS_CONTEXT_CMD_H +#define _UAPI_VS_CONTEXT_CMD_H @@ -11879,9 +11879,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cvirt_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cvirt_cmd.h ---- linux-4.4.113/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/cvirt_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h +--- linux-4.4.115/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,41 @@ +#ifndef _UAPI_VS_CVIRT_CMD_H +#define _UAPI_VS_CVIRT_CMD_H @@ -11924,9 +11924,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cvirt_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_CVIRT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/debug_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/debug_cmd.h ---- linux-4.4.113/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/debug_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/debug_cmd.h +--- linux-4.4.115/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,24 @@ +#ifndef _UAPI_VS_DEBUG_CMD_H +#define _UAPI_VS_DEBUG_CMD_H @@ -11952,9 +11952,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/debug_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_DEBUG_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device.h ---- linux-4.4.113/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/device.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/device.h +--- linux-4.4.115/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,12 @@ +#ifndef _UAPI_VS_DEVICE_H +#define _UAPI_VS_DEVICE_H @@ -11968,9 +11968,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device.h linux-4.4.113- +#define DATTR_MASK 0x00000013 + +#endif /* _UAPI_VS_DEVICE_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device_cmd.h ---- linux-4.4.113/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/device_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/device_cmd.h +--- linux-4.4.115/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef _UAPI_VS_DEVICE_CMD_H +#define _UAPI_VS_DEVICE_CMD_H @@ -11988,9 +11988,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_DEVICE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/dlimit_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/dlimit_cmd.h ---- linux-4.4.113/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/dlimit_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h +--- linux-4.4.115/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,67 @@ +#ifndef _UAPI_VS_DLIMIT_CMD_H +#define _UAPI_VS_DLIMIT_CMD_H @@ -12059,9 +12059,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/dlimit_cmd.h linux-4.4. +} + +#endif /* _UAPI_VS_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode.h ---- linux-4.4.113/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/inode.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/inode.h +--- linux-4.4.115/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,23 @@ +#ifndef _UAPI_VS_INODE_H +#define _UAPI_VS_INODE_H @@ -12086,9 +12086,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode.h linux-4.4.113-v +#define FIOC_SETXFLG _IOW('x', 6, long) + +#endif /* _UAPI_VS_INODE_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode_cmd.h ---- linux-4.4.113/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/inode_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/inode_cmd.h +--- linux-4.4.115/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,26 @@ +#ifndef _UAPI_VS_INODE_CMD_H +#define _UAPI_VS_INODE_CMD_H @@ -12116,9 +12116,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_INODE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit.h ---- linux-4.4.113/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/limit.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/limit.h +--- linux-4.4.115/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_LIMIT_H +#define _UAPI_VS_LIMIT_H @@ -12134,9 +12134,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit.h linux-4.4.113-v +#define VLIMIT_MAPPED 23 + +#endif /* _UAPI_VS_LIMIT_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit_cmd.h ---- linux-4.4.113/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/limit_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/limit_cmd.h +--- linux-4.4.115/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,40 @@ +#ifndef _UAPI_VS_LIMIT_CMD_H +#define _UAPI_VS_LIMIT_CMD_H @@ -12178,9 +12178,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit_cmd.h linux-4.4.1 +#define CRLIM_KEEP (~1ULL) + +#endif /* _UAPI_VS_LIMIT_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/monitor.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/monitor.h ---- linux-4.4.113/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/monitor.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/monitor.h +--- linux-4.4.115/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,96 @@ +#ifndef _UAPI_VS_MONITOR_H +#define _UAPI_VS_MONITOR_H @@ -12278,9 +12278,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/monitor.h linux-4.4.113 +}; + +#endif /* _UAPI_VS_MONITOR_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network.h ---- linux-4.4.113/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/network.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/network.h +--- linux-4.4.115/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,76 @@ +#ifndef _UAPI_VS_NETWORK_H +#define _UAPI_VS_NETWORK_H @@ -12358,9 +12358,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network.h linux-4.4.113 +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + +#endif /* _UAPI_VS_NETWORK_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network_cmd.h ---- linux-4.4.113/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/network_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/network_cmd.h +--- linux-4.4.115/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _UAPI_VS_NETWORK_CMD_H +#define _UAPI_VS_NETWORK_CMD_H @@ -12485,9 +12485,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network_cmd.h linux-4.4 +}; + +#endif /* _UAPI_VS_NETWORK_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/sched_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/sched_cmd.h ---- linux-4.4.113/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/sched_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/sched_cmd.h +--- linux-4.4.115/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef _UAPI_VS_SCHED_CMD_H +#define _UAPI_VS_SCHED_CMD_H @@ -12502,9 +12502,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/sched_cmd.h linux-4.4.1 +#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + +#endif /* _UAPI_VS_SCHED_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/signal_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/signal_cmd.h ---- linux-4.4.113/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/signal_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/signal_cmd.h +--- linux-4.4.115/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,31 @@ +#ifndef _UAPI_VS_SIGNAL_CMD_H +#define _UAPI_VS_SIGNAL_CMD_H @@ -12537,9 +12537,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/signal_cmd.h linux-4.4. +}; + +#endif /* _UAPI_VS_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/space_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/space_cmd.h ---- linux-4.4.113/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/space_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/space_cmd.h +--- linux-4.4.115/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,28 @@ +#ifndef _UAPI_VS_SPACE_CMD_H +#define _UAPI_VS_SPACE_CMD_H @@ -12569,9 +12569,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/space_cmd.h linux-4.4.1 +}; + +#endif /* _UAPI_VS_SPACE_CMD_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/switch.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/switch.h ---- linux-4.4.113/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/switch.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/switch.h +--- linux-4.4.115/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,90 @@ +#ifndef _UAPI_VS_SWITCH_H +#define _UAPI_VS_SWITCH_H @@ -12663,9 +12663,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/switch.h linux-4.4.113- +#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + +#endif /* _UAPI_VS_SWITCH_H */ -diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/tag_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/tag_cmd.h ---- linux-4.4.113/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/include/uapi/vserver/tag_cmd.h linux-4.4.115-vs2.3.9.7/include/uapi/vserver/tag_cmd.h +--- linux-4.4.115/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000 @@ -0,0 +1,14 @@ +#ifndef _UAPI_VS_TAG_CMD_H +#define _UAPI_VS_TAG_CMD_H @@ -12681,9 +12681,9 @@ diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/tag_cmd.h linux-4.4.113 +#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + +#endif /* _UAPI_VS_TAG_CMD_H */ -diff -NurpP --minimal linux-4.4.113/init/Kconfig linux-4.4.113-vs2.3.9.6/init/Kconfig ---- linux-4.4.113/init/Kconfig 2016-07-05 04:15:12.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/init/Kconfig 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/init/Kconfig linux-4.4.115-vs2.3.9.7/init/Kconfig +--- linux-4.4.115/init/Kconfig 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/init/Kconfig 2018-02-10 15:16:50.000000000 +0000 @@ -927,6 +927,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED menuconfig CGROUPS bool "Control Group support" @@ -12692,9 +12692,9 @@ diff -NurpP --minimal linux-4.4.113/init/Kconfig linux-4.4.113-vs2.3.9.6/init/Kc help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory -diff -NurpP --minimal linux-4.4.113/init/main.c linux-4.4.113-vs2.3.9.6/init/main.c ---- linux-4.4.113/init/main.c 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/init/main.c 2018-01-09 16:58:21.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/init/main.c linux-4.4.115-vs2.3.9.7/init/main.c +--- linux-4.4.115/init/main.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/init/main.c 2018-01-09 16:58:21.000000000 +0000 @@ -82,6 +82,7 @@ #include #include @@ -12703,9 +12703,9 @@ diff -NurpP --minimal linux-4.4.113/init/main.c linux-4.4.113-vs2.3.9.6/init/mai #include #include -diff -NurpP --minimal linux-4.4.113/ipc/mqueue.c linux-4.4.113-vs2.3.9.6/ipc/mqueue.c ---- linux-4.4.113/ipc/mqueue.c 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/ipc/mqueue.c linux-4.4.115-vs2.3.9.7/ipc/mqueue.c +--- linux-4.4.115/ipc/mqueue.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -12781,9 +12781,9 @@ diff -NurpP --minimal linux-4.4.113/ipc/mqueue.c linux-4.4.113-vs2.3.9.6/ipc/mqu free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-4.4.113/ipc/msg.c linux-4.4.113-vs2.3.9.6/ipc/msg.c ---- linux-4.4.113/ipc/msg.c 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/ipc/msg.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/ipc/msg.c linux-4.4.115-vs2.3.9.7/ipc/msg.c +--- linux-4.4.115/ipc/msg.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/ipc/msg.c 2018-02-10 15:16:50.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -12800,9 +12800,9 @@ diff -NurpP --minimal linux-4.4.113/ipc/msg.c linux-4.4.113-vs2.3.9.6/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-4.4.113/ipc/sem.c linux-4.4.113-vs2.3.9.6/ipc/sem.c ---- linux-4.4.113/ipc/sem.c 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/ipc/sem.c linux-4.4.115-vs2.3.9.7/ipc/sem.c +--- linux-4.4.115/ipc/sem.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000 @@ -85,6 +85,8 @@ #include #include @@ -12840,9 +12840,9 @@ diff -NurpP --minimal linux-4.4.113/ipc/sem.c linux-4.4.113-vs2.3.9.6/ipc/sem.c ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-4.4.113/ipc/shm.c linux-4.4.113-vs2.3.9.6/ipc/shm.c ---- linux-4.4.113/ipc/shm.c 2018-01-24 21:22:57.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/ipc/shm.c linux-4.4.115-vs2.3.9.7/ipc/shm.c +--- linux-4.4.115/ipc/shm.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000 @@ -42,6 +42,8 @@ #include #include @@ -12900,9 +12900,9 @@ diff -NurpP --minimal linux-4.4.113/ipc/shm.c linux-4.4.113-vs2.3.9.6/ipc/shm.c return error; no_id: -diff -NurpP --minimal linux-4.4.113/kernel/Makefile linux-4.4.113-vs2.3.9.6/kernel/Makefile ---- linux-4.4.113/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/Makefile linux-4.4.115-vs2.3.9.7/kernel/Makefile +--- linux-4.4.115/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000 @@ -29,6 +29,7 @@ obj-y += printk/ obj-y += irq/ obj-y += rcu/ @@ -12911,9 +12911,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/Makefile linux-4.4.113-vs2.3.9.6/kern obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o obj-$(CONFIG_FREEZER) += freezer.o -diff -NurpP --minimal linux-4.4.113/kernel/auditsc.c linux-4.4.113-vs2.3.9.6/kernel/auditsc.c ---- linux-4.4.113/kernel/auditsc.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/auditsc.c linux-4.4.115-vs2.3.9.7/kernel/auditsc.c +--- linux-4.4.115/kernel/auditsc.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000 @@ -1962,7 +1962,7 @@ static int audit_set_loginuid_perm(kuid_ if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) return -EPERM; @@ -12923,9 +12923,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/auditsc.c linux-4.4.113-vs2.3.9.6/ker 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-4.4.113/kernel/capability.c linux-4.4.113-vs2.3.9.6/kernel/capability.c ---- linux-4.4.113/kernel/capability.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/capability.c linux-4.4.115-vs2.3.9.7/kernel/capability.c +--- linux-4.4.115/kernel/capability.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000 @@ -17,6 +17,7 @@ #include #include @@ -12951,9 +12951,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/capability.c linux-4.4.113-vs2.3.9.6/ /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-4.4.113/kernel/compat.c linux-4.4.113-vs2.3.9.6/kernel/compat.c ---- linux-4.4.113/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/compat.c linux-4.4.115-vs2.3.9.7/kernel/compat.c +--- linux-4.4.115/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000 @@ -27,6 +27,7 @@ #include #include @@ -12971,9 +12971,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/compat.c linux-4.4.113-vs2.3.9.6/kern return 0; } -diff -NurpP --minimal linux-4.4.113/kernel/cred.c linux-4.4.113-vs2.3.9.6/kernel/cred.c ---- linux-4.4.113/kernel/cred.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/cred.c linux-4.4.115-vs2.3.9.7/kernel/cred.c +--- linux-4.4.115/kernel/cred.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000 @@ -64,31 +64,6 @@ struct cred init_cred = { .group_info = &init_groups, }; @@ -13043,9 +13043,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/cred.c linux-4.4.113-vs2.3.9.6/kernel EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-4.4.113/kernel/exit.c linux-4.4.113-vs2.3.9.6/kernel/exit.c ---- linux-4.4.113/kernel/exit.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/exit.c 2018-01-09 16:59:03.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/exit.c linux-4.4.115-vs2.3.9.7/kernel/exit.c +--- linux-4.4.115/kernel/exit.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/exit.c 2018-02-06 17:16:09.000000000 +0000 @@ -48,6 +48,10 @@ #include #include @@ -13138,15 +13138,18 @@ diff -NurpP --minimal linux-4.4.113/kernel/exit.c linux-4.4.113-vs2.3.9.6/kernel TASKS_RCU(preempt_disable()); TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu)); TASKS_RCU(preempt_enable()); -@@ -822,10 +849,15 @@ void do_exit(long code) - smp_mb(); - raw_spin_unlock_wait(&tsk->pi_lock); +@@ -800,6 +827,10 @@ void do_exit(long code) -+ /* needs to stay after exit_notify() */ + validate_creds_for_do_exit(tsk); + ++ /* needs to stay after exit_notify() and before preempt_disable() */ + exit_vx_info(tsk, code); + exit_nx_info(tsk); + - /* causes final put_task_struct in finish_task_switch(). */ + check_stack_usage(); + preempt_disable(); + if (tsk->nr_dirtied) +@@ -826,6 +857,7 @@ void do_exit(long code) tsk->state = TASK_DEAD; tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ schedule(); @@ -13154,9 +13157,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/exit.c linux-4.4.113-vs2.3.9.6/kernel BUG(); /* Avoid "noreturn function does return". */ for (;;) -diff -NurpP --minimal linux-4.4.113/kernel/fork.c linux-4.4.113-vs2.3.9.6/kernel/fork.c ---- linux-4.4.113/kernel/fork.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/fork.c linux-4.4.115-vs2.3.9.7/kernel/fork.c +--- linux-4.4.115/kernel/fork.c 2018-02-10 14:38:56.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000 @@ -76,6 +76,9 @@ #include #include @@ -13217,9 +13220,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/fork.c linux-4.4.113-vs2.3.9.6/kernel write_unlock_irq(&tasklist_lock); proc_fork_connector(p); -diff -NurpP --minimal linux-4.4.113/kernel/kthread.c linux-4.4.113-vs2.3.9.6/kernel/kthread.c ---- linux-4.4.113/kernel/kthread.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/kthread.c linux-4.4.115-vs2.3.9.7/kernel/kthread.c +--- linux-4.4.115/kernel/kthread.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000 @@ -19,6 +19,7 @@ #include #include @@ -13228,9 +13231,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/kthread.c linux-4.4.113-vs2.3.9.6/ker #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-4.4.113/kernel/nsproxy.c linux-4.4.113-vs2.3.9.6/kernel/nsproxy.c ---- linux-4.4.113/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/nsproxy.c linux-4.4.115-vs2.3.9.7/kernel/nsproxy.c +--- linux-4.4.115/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000 @@ -20,11 +20,14 @@ #include #include @@ -13415,9 +13418,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/nsproxy.c linux-4.4.113-vs2.3.9.6/ker return -EPERM; *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, -diff -NurpP --minimal linux-4.4.113/kernel/pid.c linux-4.4.113-vs2.3.9.6/kernel/pid.c ---- linux-4.4.113/kernel/pid.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/pid.c linux-4.4.115-vs2.3.9.7/kernel/pid.c +--- linux-4.4.115/kernel/pid.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000 @@ -38,6 +38,7 @@ #include #include @@ -13475,9 +13478,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/pid.c linux-4.4.113-vs2.3.9.6/kernel/ pid_t pid_vnr(struct pid *pid) { return pid_nr_ns(pid, task_active_pid_ns(current)); -diff -NurpP --minimal linux-4.4.113/kernel/pid_namespace.c linux-4.4.113-vs2.3.9.6/kernel/pid_namespace.c ---- linux-4.4.113/kernel/pid_namespace.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/pid_namespace.c linux-4.4.115-vs2.3.9.7/kernel/pid_namespace.c +--- linux-4.4.115/kernel/pid_namespace.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000 @@ -18,6 +18,7 @@ #include #include @@ -13502,9 +13505,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/pid_namespace.c linux-4.4.113-vs2.3.9 kmem_cache_free(pid_ns_cachep, ns); out: return ERR_PTR(err); -diff -NurpP --minimal linux-4.4.113/kernel/printk/printk.c linux-4.4.113-vs2.3.9.6/kernel/printk/printk.c ---- linux-4.4.113/kernel/printk/printk.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/printk/printk.c linux-4.4.115-vs2.3.9.7/kernel/printk/printk.c +--- linux-4.4.115/kernel/printk/printk.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000 @@ -46,6 +46,7 @@ #include #include @@ -13572,9 +13575,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/printk/printk.c linux-4.4.113-vs2.3.9 error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-4.4.113/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/kernel/ptrace.c ---- linux-4.4.113/kernel/ptrace.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/ptrace.c linux-4.4.115-vs2.3.9.7/kernel/ptrace.c +--- linux-4.4.115/kernel/ptrace.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -13595,9 +13598,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/kern return security_ptrace_access_check(task, mode); } -diff -NurpP --minimal linux-4.4.113/kernel/reboot.c linux-4.4.113-vs2.3.9.6/kernel/reboot.c ---- linux-4.4.113/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/reboot.c linux-4.4.115-vs2.3.9.7/kernel/reboot.c +--- linux-4.4.115/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000 @@ -16,6 +16,7 @@ #include #include @@ -13625,9 +13628,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/reboot.c linux-4.4.113-vs2.3.9.6/kern mutex_lock(&reboot_mutex); switch (cmd) { case LINUX_REBOOT_CMD_RESTART: -diff -NurpP --minimal linux-4.4.113/kernel/sched/core.c linux-4.4.113-vs2.3.9.6/kernel/sched/core.c ---- linux-4.4.113/kernel/sched/core.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sched/core.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sched/core.c linux-4.4.115-vs2.3.9.7/kernel/sched/core.c +--- linux-4.4.115/kernel/sched/core.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sched/core.c 2018-02-10 15:16:50.000000000 +0000 @@ -74,6 +74,8 @@ #include #include @@ -13637,7 +13640,7 @@ diff -NurpP --minimal linux-4.4.113/kernel/sched/core.c linux-4.4.113-vs2.3.9.6/ #include #include -@@ -3558,7 +3560,7 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -3559,7 +3561,7 @@ SYSCALL_DEFINE1(nice, int, increment) nice = clamp_val(nice, MIN_NICE, MAX_NICE); if (increment < 0 && !can_nice(current, nice)) @@ -13646,9 +13649,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sched/core.c linux-4.4.113-vs2.3.9.6/ retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-4.4.113/kernel/sched/cputime.c linux-4.4.113-vs2.3.9.6/kernel/sched/cputime.c ---- linux-4.4.113/kernel/sched/cputime.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sched/cputime.c linux-4.4.115-vs2.3.9.7/kernel/sched/cputime.c +--- linux-4.4.115/kernel/sched/cputime.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000 @@ -4,6 +4,7 @@ #include #include @@ -13689,9 +13692,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sched/cputime.c linux-4.4.113-vs2.3.9 account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-4.4.113/kernel/sched/fair.c linux-4.4.113-vs2.3.9.6/kernel/sched/fair.c ---- linux-4.4.113/kernel/sched/fair.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sched/fair.c linux-4.4.115-vs2.3.9.7/kernel/sched/fair.c +--- linux-4.4.115/kernel/sched/fair.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -13718,9 +13721,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sched/fair.c linux-4.4.113-vs2.3.9.6/ account_entity_dequeue(cfs_rq, se); /* -diff -NurpP --minimal linux-4.4.113/kernel/sched/loadavg.c linux-4.4.113-vs2.3.9.6/kernel/sched/loadavg.c ---- linux-4.4.113/kernel/sched/loadavg.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sched/loadavg.c 2018-01-24 23:01:30.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sched/loadavg.c linux-4.4.115-vs2.3.9.7/kernel/sched/loadavg.c +--- linux-4.4.115/kernel/sched/loadavg.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sched/loadavg.c 2018-01-24 23:01:30.000000000 +0000 @@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem */ void get_avenrun(unsigned long *loads, unsigned long offset, int shift) @@ -13741,9 +13744,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sched/loadavg.c linux-4.4.113-vs2.3.9 } long calc_load_fold_active(struct rq *this_rq) -diff -NurpP --minimal linux-4.4.113/kernel/signal.c linux-4.4.113-vs2.3.9.6/kernel/signal.c ---- linux-4.4.113/kernel/signal.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/signal.c 2018-01-11 08:03:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/signal.c linux-4.4.115-vs2.3.9.7/kernel/signal.c +--- linux-4.4.115/kernel/signal.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/signal.c 2018-01-11 08:03:00.000000000 +0000 @@ -34,6 +34,8 @@ #include #include @@ -13844,9 +13847,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/signal.c linux-4.4.113-vs2.3.9.6/kern if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-4.4.113/kernel/softirq.c linux-4.4.113-vs2.3.9.6/kernel/softirq.c ---- linux-4.4.113/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/softirq.c linux-4.4.115-vs2.3.9.7/kernel/softirq.c +--- linux-4.4.115/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000 @@ -26,6 +26,7 @@ #include #include @@ -13855,9 +13858,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/softirq.c linux-4.4.113-vs2.3.9.6/ker #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-4.4.113/kernel/sys.c linux-4.4.113-vs2.3.9.6/kernel/sys.c ---- linux-4.4.113/kernel/sys.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sys.c linux-4.4.115-vs2.3.9.7/kernel/sys.c +--- linux-4.4.115/kernel/sys.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000 @@ -54,6 +54,7 @@ #include @@ -13944,9 +13947,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sys.c linux-4.4.113-vs2.3.9.6/kernel/ return 0; return -EPERM; -diff -NurpP --minimal linux-4.4.113/kernel/sysctl.c linux-4.4.113-vs2.3.9.6/kernel/sysctl.c ---- linux-4.4.113/kernel/sysctl.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sysctl.c linux-4.4.115-vs2.3.9.7/kernel/sysctl.c +--- linux-4.4.115/kernel/sysctl.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000 @@ -87,6 +87,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include @@ -13977,9 +13980,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sysctl.c linux-4.4.113-vs2.3.9.6/kern #endif /* CONFIG_COMPACTION */ { .procname = "min_free_kbytes", -diff -NurpP --minimal linux-4.4.113/kernel/sysctl_binary.c linux-4.4.113-vs2.3.9.6/kernel/sysctl_binary.c ---- linux-4.4.113/kernel/sysctl_binary.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/sysctl_binary.c linux-4.4.115-vs2.3.9.7/kernel/sysctl_binary.c +--- linux-4.4.115/kernel/sysctl_binary.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, @@ -13988,9 +13991,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/sysctl_binary.c linux-4.4.113-vs2.3.9 { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-4.4.113/kernel/time/posix-timers.c linux-4.4.113-vs2.3.9.6/kernel/time/posix-timers.c ---- linux-4.4.113/kernel/time/posix-timers.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/time/posix-timers.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/time/posix-timers.c linux-4.4.115-vs2.3.9.7/kernel/time/posix-timers.c +--- linux-4.4.115/kernel/time/posix-timers.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/time/posix-timers.c 2018-01-09 16:36:34.000000000 +0000 @@ -48,6 +48,7 @@ #include #include @@ -14026,9 +14029,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/time/posix-timers.c linux-4.4.113-vs2 /* If we failed to send the signal the timer stops. */ return ret > 0; } -diff -NurpP --minimal linux-4.4.113/kernel/time/time.c linux-4.4.113-vs2.3.9.6/kernel/time/time.c ---- linux-4.4.113/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/time/time.c linux-4.4.115-vs2.3.9.7/kernel/time/time.c +--- linux-4.4.115/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000 @@ -37,6 +37,7 @@ #include #include @@ -14055,9 +14058,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/time/time.c linux-4.4.113-vs2.3.9.6/k return 0; } -diff -NurpP --minimal linux-4.4.113/kernel/time/timekeeping.c linux-4.4.113-vs2.3.9.6/kernel/time/timekeeping.c ---- linux-4.4.113/kernel/time/timekeeping.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/time/timekeeping.c linux-4.4.115-vs2.3.9.7/kernel/time/timekeeping.c +--- linux-4.4.115/kernel/time/timekeeping.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -14076,9 +14079,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/time/timekeeping.c linux-4.4.113-vs2. } EXPORT_SYMBOL(ktime_get_raw_and_real_ts64); -diff -NurpP --minimal linux-4.4.113/kernel/time/timer.c linux-4.4.113-vs2.3.9.6/kernel/time/timer.c ---- linux-4.4.113/kernel/time/timer.c 2018-01-24 21:22:58.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/time/timer.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/time/timer.c linux-4.4.115-vs2.3.9.7/kernel/time/timer.c +--- linux-4.4.115/kernel/time/timer.c 2018-02-10 14:38:57.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/time/timer.c 2018-02-10 15:16:50.000000000 +0000 @@ -42,6 +42,10 @@ #include #include @@ -14090,9 +14093,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/time/timer.c linux-4.4.113-vs2.3.9.6/ #include #include -diff -NurpP --minimal linux-4.4.113/kernel/user_namespace.c linux-4.4.113-vs2.3.9.6/kernel/user_namespace.c ---- linux-4.4.113/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/user_namespace.c linux-4.4.115-vs2.3.9.7/kernel/user_namespace.c +--- linux-4.4.115/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000 @@ -22,6 +22,7 @@ #include #include @@ -14136,9 +14139,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/user_namespace.c linux-4.4.113-vs2.3. /** * make_kprojid - Map a user-namespace projid pair into a kprojid. * @ns: User namespace that the projid is in -diff -NurpP --minimal linux-4.4.113/kernel/utsname.c linux-4.4.113-vs2.3.9.6/kernel/utsname.c ---- linux-4.4.113/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/utsname.c linux-4.4.115-vs2.3.9.7/kernel/utsname.c +--- linux-4.4.115/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000 @@ -16,14 +16,17 @@ #include #include @@ -14166,9 +14169,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/utsname.c linux-4.4.113-vs2.3.9.6/ker kfree(ns); } -diff -NurpP --minimal linux-4.4.113/kernel/vserver/Kconfig linux-4.4.113-vs2.3.9.6/kernel/vserver/Kconfig ---- linux-4.4.113/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/Kconfig linux-4.4.115-vs2.3.9.7/kernel/vserver/Kconfig +--- linux-4.4.115/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,230 @@ +# +# Linux VServer configuration @@ -14400,9 +14403,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/Kconfig linux-4.4.113-vs2.3.9 + bool + default n + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/Makefile linux-4.4.113-vs2.3.9.6/kernel/vserver/Makefile ---- linux-4.4.113/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/Makefile linux-4.4.115-vs2.3.9.7/kernel/vserver/Makefile +--- linux-4.4.115/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -14422,9 +14425,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/Makefile linux-4.4.113-vs2.3. +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct.c linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct.c ---- linux-4.4.113/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cacct.c linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct.c +--- linux-4.4.115/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c @@ -14468,9 +14471,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct.c linux-4.4.113-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_init.h ---- linux-4.4.113/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cacct_init.h linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct_init.h +--- linux-4.4.115/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,25 @@ + + @@ -14497,9 +14500,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_init.h linux-4.4.113-vs + return; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_proc.h ---- linux-4.4.113/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cacct_proc.h linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct_proc.h +--- linux-4.4.115/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -14554,9 +14557,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_proc.h linux-4.4.113-vs +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-4.4.113/kernel/vserver/context.c linux-4.4.113-vs2.3.9.6/kernel/vserver/context.c ---- linux-4.4.113/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/context.c linux-4.4.115-vs2.3.9.7/kernel/vserver/context.c +--- linux-4.4.115/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c @@ -15677,9 +15680,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/context.c linux-4.4.113-vs2.3 + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt.c linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt.c ---- linux-4.4.113/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cvirt.c linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt.c +--- linux-4.4.115/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000 @@ -0,0 +1,313 @@ +/* + * linux/kernel/vserver/cvirt.c @@ -15994,9 +15997,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt.c linux-4.4.113-vs2.3.9 + +#endif + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_init.h ---- linux-4.4.113/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cvirt_init.h linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt_init.h +--- linux-4.4.115/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000 @@ -0,0 +1,70 @@ + + @@ -16068,9 +16071,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_init.h linux-4.4.113-vs + return; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_proc.h ---- linux-4.4.113/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/cvirt_proc.h linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt_proc.h +--- linux-4.4.115/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -16195,9 +16198,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_proc.h linux-4.4.113-vs +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-4.4.113/kernel/vserver/debug.c linux-4.4.113-vs2.3.9.6/kernel/vserver/debug.c ---- linux-4.4.113/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/debug.c linux-4.4.115-vs2.3.9.7/kernel/vserver/debug.c +--- linux-4.4.115/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c @@ -16231,9 +16234,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/debug.c linux-4.4.113-vs2.3.9 + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/device.c linux-4.4.113-vs2.3.9.6/kernel/vserver/device.c ---- linux-4.4.113/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/device.c linux-4.4.115-vs2.3.9.7/kernel/vserver/device.c +--- linux-4.4.115/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c @@ -16678,9 +16681,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/device.c linux-4.4.113-vs2.3. +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/dlimit.c linux-4.4.113-vs2.3.9.6/kernel/vserver/dlimit.c ---- linux-4.4.113/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/dlimit.c linux-4.4.115-vs2.3.9.7/kernel/vserver/dlimit.c +--- linux-4.4.115/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c @@ -17210,9 +17213,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/dlimit.c linux-4.4.113-vs2.3. +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/helper.c linux-4.4.113-vs2.3.9.6/kernel/vserver/helper.c ---- linux-4.4.113/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/helper.c linux-4.4.115-vs2.3.9.7/kernel/vserver/helper.c +--- linux-4.4.115/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,242 @@ +/* + * linux/kernel/vserver/helper.c @@ -17456,9 +17459,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/helper.c linux-4.4.113-vs2.3. + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/history.c linux-4.4.113-vs2.3.9.6/kernel/vserver/history.c ---- linux-4.4.113/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/history.c linux-4.4.115-vs2.3.9.7/kernel/vserver/history.c +--- linux-4.4.115/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c @@ -17718,9 +17721,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/history.c linux-4.4.113-vs2.3 + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/inet.c linux-4.4.113-vs2.3.9.6/kernel/vserver/inet.c ---- linux-4.4.113/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/inet.c linux-4.4.115-vs2.3.9.7/kernel/vserver/inet.c +--- linux-4.4.115/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,236 @@ + +#include @@ -17958,9 +17961,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/inet.c linux-4.4.113-vs2.3.9. + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/init.c linux-4.4.113-vs2.3.9.6/kernel/vserver/init.c ---- linux-4.4.113/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/init.c linux-4.4.115-vs2.3.9.7/kernel/vserver/init.c +--- linux-4.4.115/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * linux/kernel/init.c @@ -18008,9 +18011,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/init.c linux-4.4.113-vs2.3.9. +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/inode.c linux-4.4.113-vs2.3.9.6/kernel/vserver/inode.c ---- linux-4.4.113/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/inode.c linux-4.4.115-vs2.3.9.7/kernel/vserver/inode.c +--- linux-4.4.115/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000 @@ -0,0 +1,440 @@ +/* + * linux/kernel/vserver/inode.c @@ -18452,9 +18455,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/inode.c linux-4.4.113-vs2.3.9 + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit.c linux-4.4.113-vs2.3.9.6/kernel/vserver/limit.c ---- linux-4.4.113/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit.c 2018-01-24 23:13:15.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/limit.c linux-4.4.115-vs2.3.9.7/kernel/vserver/limit.c +--- linux-4.4.115/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/limit.c 2018-01-24 23:13:15.000000000 +0000 @@ -0,0 +1,386 @@ +/* + * linux/kernel/vserver/limit.c @@ -18842,9 +18845,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit.c linux-4.4.113-vs2.3.9 +} +#endif /* !CONFIG_MEMCG */ + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_init.h ---- linux-4.4.113/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/limit_init.h linux-4.4.115-vs2.3.9.7/kernel/vserver/limit_init.h +--- linux-4.4.115/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,31 @@ + + @@ -18877,9 +18880,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_init.h linux-4.4.113-vs + } +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_proc.h ---- linux-4.4.113/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/limit_proc.h linux-4.4.115-vs2.3.9.7/kernel/vserver/limit_proc.h +--- linux-4.4.115/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -18938,9 +18941,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_proc.h linux-4.4.113-vs +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/network.c linux-4.4.113-vs2.3.9.6/kernel/vserver/network.c ---- linux-4.4.113/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/network.c linux-4.4.115-vs2.3.9.7/kernel/vserver/network.c +--- linux-4.4.115/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c @@ -19995,9 +19998,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/network.c linux-4.4.113-vs2.3 +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/proc.c linux-4.4.113-vs2.3.9.6/kernel/vserver/proc.c ---- linux-4.4.113/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/proc.c 2018-01-11 12:02:42.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/proc.c linux-4.4.115-vs2.3.9.7/kernel/vserver/proc.c +--- linux-4.4.115/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/proc.c 2018-01-11 12:02:42.000000000 +0000 @@ -0,0 +1,1040 @@ +/* + * linux/kernel/vserver/proc.c @@ -21039,9 +21042,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/proc.c linux-4.4.113-vs2.3.9. + return 0; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched.c linux-4.4.113-vs2.3.9.6/kernel/vserver/sched.c ---- linux-4.4.113/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/sched.c linux-4.4.115-vs2.3.9.7/kernel/vserver/sched.c +--- linux-4.4.115/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c @@ -21126,9 +21129,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched.c linux-4.4.113-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_init.h ---- linux-4.4.113/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/sched_init.h linux-4.4.115-vs2.3.9.7/kernel/vserver/sched_init.h +--- linux-4.4.115/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -21157,9 +21160,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_init.h linux-4.4.113-vs +{ + return; +} -diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_proc.h ---- linux-4.4.113/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/sched_proc.h linux-4.4.115-vs2.3.9.7/kernel/vserver/sched_proc.h +--- linux-4.4.115/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -21193,9 +21196,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_proc.h linux-4.4.113-vs +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-4.4.113/kernel/vserver/signal.c linux-4.4.113-vs2.3.9.6/kernel/vserver/signal.c ---- linux-4.4.113/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/signal.c linux-4.4.115-vs2.3.9.7/kernel/vserver/signal.c +--- linux-4.4.115/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c @@ -21331,9 +21334,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/signal.c linux-4.4.113-vs2.3. + return ret; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/space.c linux-4.4.113-vs2.3.9.6/kernel/vserver/space.c ---- linux-4.4.113/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/space.c linux-4.4.115-vs2.3.9.7/kernel/vserver/space.c +--- linux-4.4.115/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,436 @@ +/* + * linux/kernel/vserver/space.c @@ -21771,9 +21774,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/space.c linux-4.4.113-vs2.3.9 + return 0; +} + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/switch.c linux-4.4.113-vs2.3.9.6/kernel/vserver/switch.c ---- linux-4.4.113/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/switch.c linux-4.4.115-vs2.3.9.7/kernel/vserver/switch.c +--- linux-4.4.115/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c @@ -22331,9 +22334,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/switch.c linux-4.4.113-vs2.3. +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-4.4.113/kernel/vserver/sysctl.c linux-4.4.113-vs2.3.9.6/kernel/vserver/sysctl.c ---- linux-4.4.113/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/sysctl.c linux-4.4.115-vs2.3.9.7/kernel/vserver/sysctl.c +--- linux-4.4.115/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,247 @@ +/* + * kernel/vserver/sysctl.c @@ -22582,9 +22585,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/sysctl.c linux-4.4.113-vs2.3. +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/tag.c linux-4.4.113-vs2.3.9.6/kernel/vserver/tag.c ---- linux-4.4.113/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/tag.c linux-4.4.115-vs2.3.9.7/kernel/vserver/tag.c +--- linux-4.4.115/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c @@ -22649,9 +22652,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/tag.c linux-4.4.113-vs2.3.9.6 +} + + -diff -NurpP --minimal linux-4.4.113/kernel/vserver/vci_config.h linux-4.4.113-vs2.3.9.6/kernel/vserver/vci_config.h ---- linux-4.4.113/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/kernel/vserver/vci_config.h linux-4.4.115-vs2.3.9.7/kernel/vserver/vci_config.h +--- linux-4.4.115/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -22733,9 +22736,9 @@ diff -NurpP --minimal linux-4.4.113/kernel/vserver/vci_config.h linux-4.4.113-vs + 0; +} + -diff -NurpP --minimal linux-4.4.113/mm/memcontrol.c linux-4.4.113-vs2.3.9.6/mm/memcontrol.c ---- linux-4.4.113/mm/memcontrol.c 2018-01-24 21:22:59.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/memcontrol.c 2018-01-24 22:25:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/memcontrol.c linux-4.4.115-vs2.3.9.7/mm/memcontrol.c +--- linux-4.4.115/mm/memcontrol.c 2018-02-10 14:38:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/memcontrol.c 2018-02-10 15:16:50.000000000 +0000 @@ -2888,6 +2888,42 @@ static u64 mem_cgroup_read_u64(struct cg } } @@ -22779,9 +22782,9 @@ diff -NurpP --minimal linux-4.4.113/mm/memcontrol.c linux-4.4.113-vs2.3.9.6/mm/m #ifdef CONFIG_MEMCG_KMEM static int memcg_activate_kmem(struct mem_cgroup *memcg, unsigned long nr_pages) -diff -NurpP --minimal linux-4.4.113/mm/oom_kill.c linux-4.4.113-vs2.3.9.6/mm/oom_kill.c ---- linux-4.4.113/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/oom_kill.c linux-4.4.115-vs2.3.9.7/mm/oom_kill.c +--- linux-4.4.115/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000 @@ -35,6 +35,8 @@ #include #include @@ -22856,9 +22859,9 @@ diff -NurpP --minimal linux-4.4.113/mm/oom_kill.c linux-4.4.113-vs2.3.9.6/mm/oom } if (p && p != (void *)-1UL) { oom_kill_process(oc, p, points, totalpages, NULL, -diff -NurpP --minimal linux-4.4.113/mm/page_alloc.c linux-4.4.113-vs2.3.9.6/mm/page_alloc.c ---- linux-4.4.113/mm/page_alloc.c 2018-01-24 21:22:59.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/page_alloc.c 2018-01-09 16:57:52.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/page_alloc.c linux-4.4.115-vs2.3.9.7/mm/page_alloc.c +--- linux-4.4.115/mm/page_alloc.c 2018-02-10 14:38:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/page_alloc.c 2018-02-10 15:16:50.000000000 +0000 @@ -62,6 +62,8 @@ #include #include @@ -22888,9 +22891,9 @@ diff -NurpP --minimal linux-4.4.113/mm/page_alloc.c linux-4.4.113-vs2.3.9.6/mm/p } #endif -diff -NurpP --minimal linux-4.4.113/mm/pgtable-generic.c linux-4.4.113-vs2.3.9.6/mm/pgtable-generic.c ---- linux-4.4.113/mm/pgtable-generic.c 2018-01-24 21:22:59.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/pgtable-generic.c linux-4.4.115-vs2.3.9.7/mm/pgtable-generic.c +--- linux-4.4.115/mm/pgtable-generic.c 2018-02-10 14:38:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -22900,9 +22903,9 @@ diff -NurpP --minimal linux-4.4.113/mm/pgtable-generic.c linux-4.4.113-vs2.3.9.6 #include #include #include -diff -NurpP --minimal linux-4.4.113/mm/shmem.c linux-4.4.113-vs2.3.9.6/mm/shmem.c ---- linux-4.4.113/mm/shmem.c 2018-01-24 21:22:59.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/shmem.c linux-4.4.115-vs2.3.9.7/mm/shmem.c +--- linux-4.4.115/mm/shmem.c 2018-02-10 14:38:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000 @@ -2198,7 +2198,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -22921,9 +22924,9 @@ diff -NurpP --minimal linux-4.4.113/mm/shmem.c linux-4.4.113-vs2.3.9.6/mm/shmem. sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-4.4.113/mm/slab.c linux-4.4.113-vs2.3.9.6/mm/slab.c ---- linux-4.4.113/mm/slab.c 2016-07-05 04:15:13.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/slab.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/slab.c linux-4.4.115-vs2.3.9.7/mm/slab.c +--- linux-4.4.115/mm/slab.c 2016-07-05 04:15:13.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/slab.c 2018-01-09 16:36:34.000000000 +0000 @@ -337,6 +337,8 @@ static void kmem_cache_node_init(struct #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -22949,9 +22952,9 @@ diff -NurpP --minimal linux-4.4.113/mm/slab.c linux-4.4.113-vs2.3.9.6/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-4.4.113/mm/slab_vs.h linux-4.4.113-vs2.3.9.6/mm/slab_vs.h ---- linux-4.4.113/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/slab_vs.h linux-4.4.115-vs2.3.9.7/mm/slab_vs.h +--- linux-4.4.115/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000 @@ -0,0 +1,29 @@ + +#include @@ -22982,9 +22985,9 @@ diff -NurpP --minimal linux-4.4.113/mm/slab_vs.h linux-4.4.113-vs2.3.9.6/mm/slab + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-4.4.113/mm/swapfile.c linux-4.4.113-vs2.3.9.6/mm/swapfile.c ---- linux-4.4.113/mm/swapfile.c 2018-01-24 21:22:59.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/mm/swapfile.c linux-4.4.115-vs2.3.9.7/mm/swapfile.c +--- linux-4.4.115/mm/swapfile.c 2018-02-10 14:38:59.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000 @@ -39,6 +39,7 @@ #include #include @@ -23019,9 +23022,9 @@ diff -NurpP --minimal linux-4.4.113/mm/swapfile.c linux-4.4.113-vs2.3.9.6/mm/swa } /* -diff -NurpP --minimal linux-4.4.113/net/bridge/br_multicast.c linux-4.4.113-vs2.3.9.6/net/bridge/br_multicast.c ---- linux-4.4.113/net/bridge/br_multicast.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/bridge/br_multicast.c linux-4.4.115-vs2.3.9.7/net/bridge/br_multicast.c +--- linux-4.4.115/net/bridge/br_multicast.c 2018-02-10 14:39:02.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000 @@ -462,7 +462,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); @@ -23031,9 +23034,9 @@ diff -NurpP --minimal linux-4.4.113/net/bridge/br_multicast.c linux-4.4.113-vs2. kfree_skb(skb); br->has_ipv6_addr = 0; return NULL; -diff -NurpP --minimal linux-4.4.113/net/core/dev.c linux-4.4.113-vs2.3.9.6/net/core/dev.c ---- linux-4.4.113/net/core/dev.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/core/dev.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/core/dev.c linux-4.4.115-vs2.3.9.7/net/core/dev.c +--- linux-4.4.115/net/core/dev.c 2018-02-10 14:39:02.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/core/dev.c 2018-02-10 15:16:50.000000000 +0000 @@ -124,6 +124,7 @@ #include #include @@ -23151,9 +23154,9 @@ diff -NurpP --minimal linux-4.4.113/net/core/dev.c linux-4.4.113-vs2.3.9.6/net/c /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -diff -NurpP --minimal linux-4.4.113/net/core/net-procfs.c linux-4.4.113-vs2.3.9.6/net/core/net-procfs.c ---- linux-4.4.113/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/core/net-procfs.c linux-4.4.115-vs2.3.9.7/net/core/net-procfs.c +--- linux-4.4.115/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000 @@ -1,6 +1,7 @@ #include #include @@ -23177,9 +23180,9 @@ diff -NurpP --minimal linux-4.4.113/net/core/net-procfs.c linux-4.4.113-vs2.3.9. seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-4.4.113/net/core/rtnetlink.c linux-4.4.113-vs2.3.9.6/net/core/rtnetlink.c ---- linux-4.4.113/net/core/rtnetlink.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/core/rtnetlink.c linux-4.4.115-vs2.3.9.7/net/core/rtnetlink.c +--- linux-4.4.115/net/core/rtnetlink.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000 @@ -1456,6 +1456,8 @@ static int rtnl_dump_ifinfo(struct sk_bu hlist_for_each_entry(dev, head, index_hlist) { if (idx < s_idx) @@ -23199,9 +23202,9 @@ diff -NurpP --minimal linux-4.4.113/net/core/rtnetlink.c linux-4.4.113-vs2.3.9.6 if (dev->reg_state != NETREG_REGISTERED) return; -diff -NurpP --minimal linux-4.4.113/net/core/sock.c linux-4.4.113-vs2.3.9.6/net/core/sock.c ---- linux-4.4.113/net/core/sock.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/core/sock.c linux-4.4.115-vs2.3.9.7/net/core/sock.c +--- linux-4.4.115/net/core/sock.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000 @@ -134,6 +134,10 @@ #include @@ -23269,9 +23272,9 @@ diff -NurpP --minimal linux-4.4.113/net/core/sock.c linux-4.4.113-vs2.3.9.6/net/ #ifdef CONFIG_NET_RX_BUSY_POLL sk->sk_napi_id = 0; sk->sk_ll_usec = sysctl_net_busy_read; -diff -NurpP --minimal linux-4.4.113/net/ipv4/af_inet.c linux-4.4.113-vs2.3.9.6/net/ipv4/af_inet.c ---- linux-4.4.113/net/ipv4/af_inet.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/af_inet.c linux-4.4.115-vs2.3.9.7/net/ipv4/af_inet.c +--- linux-4.4.115/net/ipv4/af_inet.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000 @@ -308,10 +308,15 @@ lookup_protocol: } @@ -23350,10 +23353,10 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/af_inet.c linux-4.4.113-vs2.3.9.6/n const struct proto_ops inet_stream_ops = { .family = PF_INET, -diff -NurpP --minimal linux-4.4.113/net/ipv4/arp.c linux-4.4.113-vs2.3.9.6/net/ipv4/arp.c ---- linux-4.4.113/net/ipv4/arp.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/arp.c 2018-01-09 16:36:34.000000000 +0000 -@@ -1290,6 +1290,7 @@ static void arp_format_neigh_entry(struc +diff -NurpP --minimal linux-4.4.115/net/ipv4/arp.c linux-4.4.115-vs2.3.9.7/net/ipv4/arp.c +--- linux-4.4.115/net/ipv4/arp.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/arp.c 2018-02-10 15:16:50.000000000 +0000 +@@ -1295,6 +1295,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -23361,7 +23364,7 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/arp.c linux-4.4.113-vs2.3.9.6/net/i read_lock(&n->lock); /* Convert hardware address to XX:XX:XX:XX ... form. */ #if IS_ENABLED(CONFIG_AX25) -@@ -1321,6 +1322,7 @@ static void arp_format_pneigh_entry(stru +@@ -1326,6 +1327,7 @@ static void arp_format_pneigh_entry(stru int hatype = dev ? dev->type : 0; char tbuf[16]; @@ -23369,9 +23372,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/arp.c linux-4.4.113-vs2.3.9.6/net/i sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-4.4.113/net/ipv4/devinet.c linux-4.4.113-vs2.3.9.6/net/ipv4/devinet.c ---- linux-4.4.113/net/ipv4/devinet.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/devinet.c linux-4.4.115-vs2.3.9.7/net/ipv4/devinet.c +--- linux-4.4.115/net/ipv4/devinet.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000 @@ -538,6 +538,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -23438,9 +23441,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/devinet.c linux-4.4.113-vs2.3.9.6/n if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-4.4.113/net/ipv4/fib_trie.c linux-4.4.113-vs2.3.9.6/net/ipv4/fib_trie.c ---- linux-4.4.113/net/ipv4/fib_trie.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/fib_trie.c linux-4.4.115-vs2.3.9.7/net/ipv4/fib_trie.c +--- linux-4.4.115/net/ipv4/fib_trie.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000 @@ -2591,6 +2591,7 @@ static int fib_route_seq_show(struct seq seq_setwidth(seq, 127); @@ -23449,9 +23452,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/fib_trie.c linux-4.4.113-vs2.3.9.6/ if (fi) seq_printf(seq, "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_connection_sock.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_connection_sock.c ---- linux-4.4.113/net/ipv4/inet_connection_sock.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/inet_connection_sock.c linux-4.4.115-vs2.3.9.7/net/ipv4/inet_connection_sock.c +--- linux-4.4.115/net/ipv4/inet_connection_sock.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000 @@ -43,6 +43,37 @@ void inet_get_local_port_range(struct ne } EXPORT_SYMBOL(inet_get_local_port_range); @@ -23508,9 +23511,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_connection_sock.c linux-4.4.11 break; } } -diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_diag.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_diag.c ---- linux-4.4.113/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/inet_diag.c linux-4.4.115-vs2.3.9.7/net/ipv4/inet_diag.c +--- linux-4.4.115/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000 @@ -31,6 +31,8 @@ #include @@ -23538,9 +23541,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_diag.c linux-4.4.113-vs2.3.9.6 if (num < s_num) goto next_normal; state = (sk->sk_state == TCP_TIME_WAIT) ? -diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_hashtables.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_hashtables.c ---- linux-4.4.113/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/inet_hashtables.c linux-4.4.115-vs2.3.9.7/net/ipv4/inet_hashtables.c +--- linux-4.4.115/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -23577,9 +23580,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_hashtables.c linux-4.4.113-vs2 /* * if the nulls value we got at the end of this lookup is * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-4.4.113/net/ipv4/netfilter.c linux-4.4.113-vs2.3.9.6/net/ipv4/netfilter.c ---- linux-4.4.113/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/netfilter.c linux-4.4.115-vs2.3.9.7/net/ipv4/netfilter.c +--- linux-4.4.115/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000 @@ -11,7 +11,7 @@ #include #include @@ -23589,9 +23592,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/netfilter.c linux-4.4.113-vs2.3.9.6 #include #include #include -diff -NurpP --minimal linux-4.4.113/net/ipv4/raw.c linux-4.4.113-vs2.3.9.6/net/ipv4/raw.c ---- linux-4.4.113/net/ipv4/raw.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/raw.c linux-4.4.115-vs2.3.9.7/net/ipv4/raw.c +--- linux-4.4.115/net/ipv4/raw.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000 @@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && @@ -23684,9 +23687,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/raw.c linux-4.4.113-vs2.3.9.6/net/i if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-4.4.113/net/ipv4/route.c linux-4.4.113-vs2.3.9.6/net/ipv4/route.c ---- linux-4.4.113/net/ipv4/route.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/route.c linux-4.4.115-vs2.3.9.7/net/ipv4/route.c +--- linux-4.4.115/net/ipv4/route.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000 @@ -2226,7 +2226,7 @@ struct rtable *__ip_route_output_key_has @@ -23696,9 +23699,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/route.c linux-4.4.113-vs2.3.9.6/net rth = ERR_PTR(-ENODEV); if (!dev_out) goto out; -diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp.c ---- linux-4.4.113/net/ipv4/tcp.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/tcp.c linux-4.4.115-vs2.3.9.7/net/ipv4/tcp.c +--- linux-4.4.115/net/ipv4/tcp.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/tcp.c 2018-02-10 15:16:50.000000000 +0000 @@ -269,6 +269,7 @@ #include #include @@ -23707,9 +23710,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp.c linux-4.4.113-vs2.3.9.6/net/i #include #include -diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_ipv4.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_ipv4.c ---- linux-4.4.113/net/ipv4/tcp_ipv4.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/tcp_ipv4.c linux-4.4.115-vs2.3.9.7/net/ipv4/tcp_ipv4.c +--- linux-4.4.115/net/ipv4/tcp_ipv4.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000 @@ -1885,6 +1885,10 @@ static void *listening_get_next(struct s sk = sk_nulls_next(sk); get_sk: @@ -23779,9 +23782,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_ipv4.c linux-4.4.113-vs2.3.9.6/ destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_minisocks.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_minisocks.c ---- linux-4.4.113/net/ipv4/tcp_minisocks.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/tcp_minisocks.c linux-4.4.115-vs2.3.9.7/net/ipv4/tcp_minisocks.c +--- linux-4.4.115/net/ipv4/tcp_minisocks.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000 @@ -23,6 +23,9 @@ #include #include @@ -23804,9 +23807,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_minisocks.c linux-4.4.113-vs2.3 #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-4.4.113/net/ipv4/udp.c linux-4.4.113-vs2.3.9.6/net/ipv4/udp.c ---- linux-4.4.113/net/ipv4/udp.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv4/udp.c linux-4.4.115-vs2.3.9.7/net/ipv4/udp.c +--- linux-4.4.115/net/ipv4/udp.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000 @@ -309,14 +309,7 @@ fail: } EXPORT_SYMBOL(udp_lib_get_port); @@ -23938,9 +23941,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv4/udp.c linux-4.4.113-vs2.3.9.6/net/i __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-4.4.113/net/ipv6/addrconf.c linux-4.4.113-vs2.3.9.6/net/ipv6/addrconf.c ---- linux-4.4.113/net/ipv6/addrconf.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/addrconf.c linux-4.4.115-vs2.3.9.7/net/ipv6/addrconf.c +--- linux-4.4.115/net/ipv6/addrconf.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000 @@ -92,6 +92,8 @@ #include #include @@ -24075,9 +24078,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/addrconf.c linux-4.4.113-vs2.3.9.6/ idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-4.4.113/net/ipv6/af_inet6.c linux-4.4.113-vs2.3.9.6/net/ipv6/af_inet6.c ---- linux-4.4.113/net/ipv6/af_inet6.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/af_inet6.c linux-4.4.115-vs2.3.9.7/net/ipv6/af_inet6.c +--- linux-4.4.115/net/ipv6/af_inet6.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000 @@ -43,6 +43,8 @@ #include #include @@ -24166,9 +24169,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/af_inet6.c linux-4.4.113-vs2.3.9.6/ if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-4.4.113/net/ipv6/datagram.c linux-4.4.113-vs2.3.9.6/net/ipv6/datagram.c ---- linux-4.4.113/net/ipv6/datagram.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/datagram.c linux-4.4.115-vs2.3.9.7/net/ipv6/datagram.c +--- linux-4.4.115/net/ipv6/datagram.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000 @@ -733,7 +733,7 @@ int ip6_datagram_send_ctl(struct net *ne rcu_read_lock(); @@ -24178,9 +24181,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/datagram.c linux-4.4.113-vs2.3.9.6/ if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-4.4.113/net/ipv6/fib6_rules.c linux-4.4.113-vs2.3.9.6/net/ipv6/fib6_rules.c ---- linux-4.4.113/net/ipv6/fib6_rules.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/fib6_rules.c linux-4.4.115-vs2.3.9.7/net/ipv6/fib6_rules.c +--- linux-4.4.115/net/ipv6/fib6_rules.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000 @@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, @@ -24190,9 +24193,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/fib6_rules.c linux-4.4.113-vs2.3.9. goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-4.4.113/net/ipv6/inet6_hashtables.c linux-4.4.113-vs2.3.9.6/net/ipv6/inet6_hashtables.c ---- linux-4.4.113/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/inet6_hashtables.c linux-4.4.115-vs2.3.9.7/net/ipv6/inet6_hashtables.c +--- linux-4.4.115/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000 @@ -16,6 +16,7 @@ #include @@ -24219,9 +24222,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/inet6_hashtables.c linux-4.4.113-vs } if (sk->sk_bound_dev_if) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_fib.c linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_fib.c ---- linux-4.4.113/net/ipv6/ip6_fib.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/ip6_fib.c linux-4.4.115-vs2.3.9.7/net/ipv6/ip6_fib.c +--- linux-4.4.115/net/ipv6/ip6_fib.c 2018-02-10 14:39:03.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000 @@ -1968,6 +1968,7 @@ static int ipv6_route_seq_show(struct se struct rt6_info *rt = v; struct ipv6_route_iter *iter = seq->private; @@ -24230,9 +24233,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_fib.c linux-4.4.113-vs2.3.9.6/n seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_output.c linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_output.c ---- linux-4.4.113/net/ipv6/ip6_output.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_output.c 2018-01-25 00:25:03.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/ip6_output.c linux-4.4.115-vs2.3.9.7/net/ipv6/ip6_output.c +--- linux-4.4.115/net/ipv6/ip6_output.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/ip6_output.c 2018-02-10 15:16:50.000000000 +0000 @@ -941,7 +941,8 @@ static int ip6_dst_lookup_tail(struct ne rt = (*dst)->error ? NULL : (struct rt6_info *)*dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, @@ -24243,9 +24246,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_output.c linux-4.4.113-vs2.3.9. if (err) goto out_err_release; -diff -NurpP --minimal linux-4.4.113/net/ipv6/ndisc.c linux-4.4.113-vs2.3.9.6/net/ipv6/ndisc.c ---- linux-4.4.113/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/ndisc.c linux-4.4.115-vs2.3.9.7/net/ipv6/ndisc.c +--- linux-4.4.115/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000 @@ -501,7 +501,7 @@ void ndisc_send_na(struct net_device *de } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, @@ -24255,9 +24258,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/ndisc.c linux-4.4.113-vs2.3.9.6/net return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-4.4.113/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.113-vs2.3.9.6/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c ---- linux-4.4.113/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.115-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c +--- linux-4.4.115/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000 @@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s ctinfo == IP_CT_RELATED_REPLY)); @@ -24267,9 +24270,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c return NF_DROP; nfct_nat(ct)->masq_index = out->ifindex; -diff -NurpP --minimal linux-4.4.113/net/ipv6/raw.c linux-4.4.113-vs2.3.9.6/net/ipv6/raw.c ---- linux-4.4.113/net/ipv6/raw.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/raw.c linux-4.4.115-vs2.3.9.7/net/ipv6/raw.c +--- linux-4.4.115/net/ipv6/raw.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000 @@ -30,6 +30,7 @@ #include #include @@ -24292,9 +24295,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/raw.c linux-4.4.113-vs2.3.9.6/net/i /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -diff -NurpP --minimal linux-4.4.113/net/ipv6/route.c linux-4.4.113-vs2.3.9.6/net/ipv6/route.c ---- linux-4.4.113/net/ipv6/route.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/route.c linux-4.4.115-vs2.3.9.7/net/ipv6/route.c +--- linux-4.4.115/net/ipv6/route.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000 @@ -62,6 +62,7 @@ #include #include @@ -24335,9 +24338,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/route.c linux-4.4.113-vs2.3.9.6/net nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf)) goto nla_put_failure; } -diff -NurpP --minimal linux-4.4.113/net/ipv6/tcp_ipv6.c linux-4.4.113-vs2.3.9.6/net/ipv6/tcp_ipv6.c ---- linux-4.4.113/net/ipv6/tcp_ipv6.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/tcp_ipv6.c linux-4.4.115-vs2.3.9.7/net/ipv6/tcp_ipv6.c +--- linux-4.4.115/net/ipv6/tcp_ipv6.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000 @@ -69,6 +69,7 @@ #include @@ -24370,9 +24373,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/tcp_ipv6.c linux-4.4.113-vs2.3.9.6/ } addr_type = ipv6_addr_type(&usin->sin6_addr); -diff -NurpP --minimal linux-4.4.113/net/ipv6/udp.c linux-4.4.113-vs2.3.9.6/net/ipv6/udp.c ---- linux-4.4.113/net/ipv6/udp.c 2018-01-24 21:23:00.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/udp.c linux-4.4.115-vs2.3.9.7/net/ipv6/udp.c +--- linux-4.4.115/net/ipv6/udp.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000 @@ -47,6 +47,7 @@ #include #include @@ -24466,9 +24469,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/udp.c linux-4.4.113-vs2.3.9.6/net/i } if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { -diff -NurpP --minimal linux-4.4.113/net/ipv6/xfrm6_policy.c linux-4.4.113-vs2.3.9.6/net/ipv6/xfrm6_policy.c ---- linux-4.4.113/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/ipv6/xfrm6_policy.c linux-4.4.115-vs2.3.9.7/net/ipv6/xfrm6_policy.c +--- linux-4.4.115/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000 @@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n return -EHOSTUNREACH; @@ -24479,9 +24482,9 @@ diff -NurpP --minimal linux-4.4.113/net/ipv6/xfrm6_policy.c linux-4.4.113-vs2.3. dst_release(dst); return 0; } -diff -NurpP --minimal linux-4.4.113/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.113-vs2.3.9.6/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-4.4.113/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.115-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-4.4.115/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000 @@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && @@ -24491,9 +24494,9 @@ diff -NurpP --minimal linux-4.4.113/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.11 goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-4.4.113/net/netlink/af_netlink.c linux-4.4.113-vs2.3.9.6/net/netlink/af_netlink.c ---- linux-4.4.113/net/netlink/af_netlink.c 2018-01-24 21:23:01.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/netlink/af_netlink.c linux-4.4.115-vs2.3.9.7/net/netlink/af_netlink.c +--- linux-4.4.115/net/netlink/af_netlink.c 2018-02-10 14:39:04.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000 @@ -62,6 +62,8 @@ #include #include @@ -24513,9 +24516,9 @@ diff -NurpP --minimal linux-4.4.113/net/netlink/af_netlink.c linux-4.4.113-vs2.3 return nlk; } -diff -NurpP --minimal linux-4.4.113/net/socket.c linux-4.4.113-vs2.3.9.6/net/socket.c ---- linux-4.4.113/net/socket.c 2018-01-24 21:23:01.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/socket.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/socket.c linux-4.4.115-vs2.3.9.7/net/socket.c +--- linux-4.4.115/net/socket.c 2018-02-10 14:39:05.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/socket.c 2018-02-10 15:16:50.000000000 +0000 @@ -99,10 +99,12 @@ #include @@ -24592,9 +24595,9 @@ diff -NurpP --minimal linux-4.4.113/net/socket.c linux-4.4.113-vs2.3.9.6/net/soc err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth.c linux-4.4.113-vs2.3.9.6/net/sunrpc/auth.c ---- linux-4.4.113/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/sunrpc/auth.c linux-4.4.115-vs2.3.9.7/net/sunrpc/auth.c +--- linux-4.4.115/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000 @@ -15,6 +15,7 @@ #include #include @@ -24619,9 +24622,9 @@ diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth.c linux-4.4.113-vs2.3.9.6/ne }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth_unix.c linux-4.4.113-vs2.3.9.6/net/sunrpc/auth_unix.c ---- linux-4.4.113/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/sunrpc/auth_unix.c linux-4.4.115-vs2.3.9.7/net/sunrpc/auth_unix.c +--- linux-4.4.115/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000 @@ -13,11 +13,13 @@ #include #include @@ -24678,9 +24681,9 @@ diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth_unix.c linux-4.4.113-vs2.3.9 hold = p++; for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); -diff -NurpP --minimal linux-4.4.113/net/sunrpc/clnt.c linux-4.4.113-vs2.3.9.6/net/sunrpc/clnt.c ---- linux-4.4.113/net/sunrpc/clnt.c 2018-01-24 21:23:01.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/sunrpc/clnt.c linux-4.4.115-vs2.3.9.7/net/sunrpc/clnt.c +--- linux-4.4.115/net/sunrpc/clnt.c 2018-02-10 14:39:05.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000 @@ -31,6 +31,7 @@ #include #include @@ -24699,9 +24702,9 @@ diff -NurpP --minimal linux-4.4.113/net/sunrpc/clnt.c linux-4.4.113-vs2.3.9.6/ne return clnt; } -diff -NurpP --minimal linux-4.4.113/net/unix/af_unix.c linux-4.4.113-vs2.3.9.6/net/unix/af_unix.c ---- linux-4.4.113/net/unix/af_unix.c 2018-01-24 21:23:02.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/net/unix/af_unix.c linux-4.4.115-vs2.3.9.7/net/unix/af_unix.c +--- linux-4.4.115/net/unix/af_unix.c 2018-02-10 14:39:06.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000 @@ -117,6 +117,8 @@ #include #include @@ -24738,9 +24741,9 @@ diff -NurpP --minimal linux-4.4.113/net/unix/af_unix.c linux-4.4.113-vs2.3.9.6/n if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-4.4.113/scripts/checksyscalls.sh linux-4.4.113-vs2.3.9.6/scripts/checksyscalls.sh ---- linux-4.4.113/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/scripts/checksyscalls.sh linux-4.4.115-vs2.3.9.7/scripts/checksyscalls.sh +--- linux-4.4.115/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000 @@ -196,7 +196,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg @@ -24749,9 +24752,9 @@ diff -NurpP --minimal linux-4.4.113/scripts/checksyscalls.sh linux-4.4.113-vs2.3 EOF } -diff -NurpP --minimal linux-4.4.113/security/commoncap.c linux-4.4.113-vs2.3.9.6/security/commoncap.c ---- linux-4.4.113/security/commoncap.c 2018-01-24 21:23:02.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/security/commoncap.c linux-4.4.115-vs2.3.9.7/security/commoncap.c +--- linux-4.4.115/security/commoncap.c 2018-02-10 14:39:06.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000 @@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed( int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) @@ -24793,9 +24796,9 @@ diff -NurpP --minimal linux-4.4.113/security/commoncap.c linux-4.4.113-vs2.3.9.6 return -EPERM; return 0; } -diff -NurpP --minimal linux-4.4.113/security/selinux/hooks.c linux-4.4.113-vs2.3.9.6/security/selinux/hooks.c ---- linux-4.4.113/security/selinux/hooks.c 2018-01-24 21:23:02.000000000 +0000 -+++ linux-4.4.113-vs2.3.9.6/security/selinux/hooks.c 2018-01-09 16:36:34.000000000 +0000 +diff -NurpP --minimal linux-4.4.115/security/selinux/hooks.c linux-4.4.115-vs2.3.9.7/security/selinux/hooks.c +--- linux-4.4.115/security/selinux/hooks.c 2018-02-10 14:39:06.000000000 +0000 ++++ linux-4.4.115-vs2.3.9.7/security/selinux/hooks.c 2018-02-10 15:16:50.000000000 +0000 @@ -67,7 +67,6 @@ #include #include diff --git a/kernel.spec b/kernel.spec index 380b61fb..70ecae76 100644 --- a/kernel.spec +++ b/kernel.spec @@ -72,7 +72,7 @@ %define rel 1 %define basever 4.4 -%define postver .116 +%define postver .117 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -124,7 +124,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: d2d693ffce6382ba97a18d116e4fb741 +# Patch0-md5: 62d464cfeaffc759cf5d9c5d5e4338ed %endif Source1: kernel.sysconfig @@ -192,7 +192,7 @@ Patch59: kernel-rndis_host-wm5.patch # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch Patch85: kernel-hostap.patch -%define vserver_patch 4.4.111-vs2.3.9.6 +%define vserver_patch 4.4.115-vs2.3.9.7 # http://vserver.13thfloor.at/Experimental/patch-4.4.113-vs2.3.9.6.diff # note there are additional patches from above url: # - *fix* are real fixes (we want these)