-diff -NurpP --minimal linux-4.1.12/Documentation/vserver/debug.txt linux-4.1.12-vs2.3.8.3/Documentation/vserver/debug.txt
---- linux-4.1.12/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/Documentation/vserver/debug.txt 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/Documentation/vserver/debug.txt linux-4.1.18-vs2.3.8.4/Documentation/vserver/debug.txt
+--- linux-4.1.18/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/Documentation/vserver/debug.txt 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
+ "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]"
+ "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]"
+ "vroot_get_real_bdev not set"
-+ 1 2 "cow_break_link(»%s«)"
-+ "temp copy »%s«"
++ 1 2 "cow_break_link(?%s?)"
++ "temp copy ?%s?"
+ 2 4 "dentry_open(new): %p"
+ "dentry_open(old): %p"
+ "lookup_create(new): %p"
-+ "old path »%s«"
++ "old path ?%s?"
+ "path_lookup(old): %d"
+ "vfs_create(new): %d"
+ "vfs_rename: %d"
+
+debug_tag:
+
-+ 7 80 "dx_parse_tag(»%s«): %d:#%d"
++ 7 80 "dx_parse_tag(?%s?): %d:#%d"
+ "dx_propagate_tag(%p[#%lu.%d]): %d,%d"
+
+debug_xid:
+ 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.1.12/arch/alpha/Kconfig linux-4.1.12-vs2.3.8.3/arch/alpha/Kconfig
---- linux-4.1.12/arch/alpha/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/alpha/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/alpha/Kconfig linux-4.1.18-vs2.3.8.4/arch/alpha/Kconfig
+--- linux-4.1.18/arch/alpha/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/alpha/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -744,6 +744,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/alpha/kernel/systbls.S linux-4.1.12-vs2.3.8.3/arch/alpha/kernel/systbls.S
---- linux-4.1.12/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/alpha/kernel/systbls.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/alpha/kernel/systbls.S linux-4.1.18-vs2.3.8.4/arch/alpha/kernel/systbls.S
+--- linux-4.1.18/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/alpha/kernel/systbls.S 2015-07-06 20:43:43.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
.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.1.12/arch/alpha/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/alpha/kernel/traps.c
---- linux-4.1.12/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/alpha/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/alpha/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/alpha/kernel/traps.c
+--- linux-4.1.18/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/alpha/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
@@ -174,7 +174,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
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.1.12/arch/arm/Kconfig linux-4.1.12-vs2.3.8.3/arch/arm/Kconfig
---- linux-4.1.12/arch/arm/Kconfig 2015-10-29 09:20:01.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/arm/Kconfig 2015-10-29 09:25:24.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/arm/Kconfig linux-4.1.18-vs2.3.8.4/arch/arm/Kconfig
+--- linux-4.1.18/arch/arm/Kconfig 2016-02-18 18:01:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/arm/Kconfig 2015-10-29 09:25:24.000000000 +0000
@@ -2110,6 +2110,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/arm/kernel/calls.S linux-4.1.12-vs2.3.8.3/arch/arm/kernel/calls.S
---- linux-4.1.12/arch/arm/kernel/calls.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/arm/kernel/calls.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/arm/kernel/calls.S linux-4.1.18-vs2.3.8.4/arch/arm/kernel/calls.S
+--- linux-4.1.18/arch/arm/kernel/calls.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/arm/kernel/calls.S 2015-07-06 20:43:43.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-4.1.12/arch/arm/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/arm/kernel/traps.c
---- linux-4.1.12/arch/arm/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/arm/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/arm/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/arm/kernel/traps.c
+--- linux-4.1.18/arch/arm/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/arm/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
@@ -250,8 +250,8 @@ static int __die(const char *str, int er
print_modules();
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-4.1.12/arch/cris/Kconfig linux-4.1.12-vs2.3.8.3/arch/cris/Kconfig
---- linux-4.1.12/arch/cris/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/cris/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/cris/Kconfig linux-4.1.18-vs2.3.8.4/arch/cris/Kconfig
+--- linux-4.1.18/arch/cris/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/cris/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -570,6 +570,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/ia64/Kconfig linux-4.1.12-vs2.3.8.3/arch/ia64/Kconfig
---- linux-4.1.12/arch/ia64/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/ia64/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/ia64/Kconfig linux-4.1.18-vs2.3.8.4/arch/ia64/Kconfig
+--- linux-4.1.18/arch/ia64/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/ia64/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -628,6 +628,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/ia64/kernel/entry.S linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/entry.S
---- linux-4.1.12/arch/ia64/kernel/entry.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/entry.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/ia64/kernel/entry.S linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/entry.S
+--- linux-4.1.18/arch/ia64/kernel/entry.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/entry.S 2015-07-06 20:43:43.000000000 +0000
@@ -1706,7 +1706,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-4.1.12/arch/ia64/kernel/ptrace.c linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/ptrace.c
---- linux-4.1.12/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/ia64/kernel/ptrace.c linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/ptrace.c
+--- linux-4.1.18/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-4.1.12/arch/ia64/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/traps.c
---- linux-4.1.12/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/ia64/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/ia64/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/traps.c
+--- linux-4.1.18/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/ia64/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-4.1.12/arch/m32r/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/m32r/kernel/traps.c
---- linux-4.1.12/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/m32r/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/m32r/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/m32r/kernel/traps.c
+--- linux-4.1.18/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/m32r/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-4.1.12/arch/m68k/Kconfig linux-4.1.12-vs2.3.8.3/arch/m68k/Kconfig
---- linux-4.1.12/arch/m68k/Kconfig 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/m68k/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/m68k/Kconfig linux-4.1.18-vs2.3.8.4/arch/m68k/Kconfig
+--- linux-4.1.18/arch/m68k/Kconfig 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/m68k/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -163,6 +163,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/mips/Kconfig linux-4.1.12-vs2.3.8.3/arch/mips/Kconfig
---- linux-4.1.12/arch/mips/Kconfig 2015-10-29 09:20:02.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/Kconfig 2015-10-29 09:25:24.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/Kconfig linux-4.1.18-vs2.3.8.4/arch/mips/Kconfig
+--- linux-4.1.18/arch/mips/Kconfig 2016-02-18 18:01:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/Kconfig 2015-10-29 09:25:24.000000000 +0000
@@ -2887,6 +2887,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/mips/kernel/ptrace.c linux-4.1.12-vs2.3.8.3/arch/mips/kernel/ptrace.c
---- linux-4.1.12/arch/mips/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/ptrace.c linux-4.1.18-vs2.3.8.4/arch/mips/kernel/ptrace.c
+--- linux-4.1.18/arch/mips/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
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.1.12/arch/mips/kernel/scall32-o32.S linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall32-o32.S
---- linux-4.1.12/arch/mips/kernel/scall32-o32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall32-o32.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/scall32-o32.S linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall32-o32.S
+--- linux-4.1.18/arch/mips/kernel/scall32-o32.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall32-o32.S 2015-07-06 20:43:43.000000000 +0000
@@ -502,7 +502,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify /* 4275 */
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.1.12/arch/mips/kernel/scall64-64.S linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-64.S
---- linux-4.1.12/arch/mips/kernel/scall64-64.S 2015-10-29 09:20:02.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-64.S 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/scall64-64.S linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-64.S
+--- linux-4.1.18/arch/mips/kernel/scall64-64.S 2016-02-18 18:01:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-64.S 2015-10-29 09:25:25.000000000 +0000
@@ -355,7 +355,7 @@ EXPORT(sys_call_table)
PTR sys_mq_timedreceive
PTR sys_mq_notify
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.1.12/arch/mips/kernel/scall64-n32.S linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-n32.S
---- linux-4.1.12/arch/mips/kernel/scall64-n32.S 2015-10-29 09:20:02.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-n32.S 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/scall64-n32.S linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-n32.S
+--- linux-4.1.18/arch/mips/kernel/scall64-n32.S 2016-02-18 18:01:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-n32.S 2015-10-29 09:25:25.000000000 +0000
@@ -348,7 +348,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-4.1.12/arch/mips/kernel/scall64-o32.S linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-o32.S
---- linux-4.1.12/arch/mips/kernel/scall64-o32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/scall64-o32.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/scall64-o32.S linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-o32.S
+--- linux-4.1.18/arch/mips/kernel/scall64-o32.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/scall64-o32.S 2015-07-06 20:43:43.000000000 +0000
@@ -487,7 +487,7 @@ EXPORT(sys32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-4.1.12/arch/mips/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/mips/kernel/traps.c
---- linux-4.1.12/arch/mips/kernel/traps.c 2015-10-29 09:20:02.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/mips/kernel/traps.c 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/mips/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/mips/kernel/traps.c
+--- linux-4.1.18/arch/mips/kernel/traps.c 2016-02-18 18:01:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/mips/kernel/traps.c 2015-10-29 09:25:25.000000000 +0000
@@ -349,9 +349,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.1.12/arch/parisc/Kconfig linux-4.1.12-vs2.3.8.3/arch/parisc/Kconfig
---- linux-4.1.12/arch/parisc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/parisc/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/parisc/Kconfig linux-4.1.18-vs2.3.8.4/arch/parisc/Kconfig
+--- linux-4.1.18/arch/parisc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/parisc/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -338,6 +338,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/parisc/kernel/syscall_table.S linux-4.1.12-vs2.3.8.3/arch/parisc/kernel/syscall_table.S
---- linux-4.1.12/arch/parisc/kernel/syscall_table.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/parisc/kernel/syscall_table.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/parisc/kernel/syscall_table.S linux-4.1.18-vs2.3.8.4/arch/parisc/kernel/syscall_table.S
+--- linux-4.1.18/arch/parisc/kernel/syscall_table.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/parisc/kernel/syscall_table.S 2015-07-06 20:43:43.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-4.1.12/arch/parisc/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/parisc/kernel/traps.c
---- linux-4.1.12/arch/parisc/kernel/traps.c 2015-10-29 09:20:03.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/parisc/kernel/traps.c 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/parisc/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/parisc/kernel/traps.c
+--- linux-4.1.18/arch/parisc/kernel/traps.c 2016-02-18 18:01:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/parisc/kernel/traps.c 2015-10-29 09:25:25.000000000 +0000
@@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
return; /* STFU */
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-4.1.12/arch/powerpc/Kconfig linux-4.1.12-vs2.3.8.3/arch/powerpc/Kconfig
---- linux-4.1.12/arch/powerpc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/powerpc/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/powerpc/Kconfig linux-4.1.18-vs2.3.8.4/arch/powerpc/Kconfig
+--- linux-4.1.18/arch/powerpc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/powerpc/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -1077,6 +1077,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-4.1.12/arch/powerpc/include/uapi/asm/unistd.h linux-4.1.12-vs2.3.8.3/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.1.12/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/powerpc/include/uapi/asm/unistd.h linux-4.1.18-vs2.3.8.4/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.1.18/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/powerpc/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-4.1.12/arch/powerpc/kernel/traps.c linux-4.1.12-vs2.3.8.3/arch/powerpc/kernel/traps.c
---- linux-4.1.12/arch/powerpc/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/powerpc/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/powerpc/kernel/traps.c linux-4.1.18-vs2.3.8.4/arch/powerpc/kernel/traps.c
+--- linux-4.1.18/arch/powerpc/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/powerpc/kernel/traps.c 2015-07-06 20:43:43.000000000 +0000
@@ -1313,8 +1313,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-4.1.12/arch/s390/Kconfig linux-4.1.12-vs2.3.8.3/arch/s390/Kconfig
---- linux-4.1.12/arch/s390/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/s390/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/s390/Kconfig linux-4.1.18-vs2.3.8.4/arch/s390/Kconfig
+--- linux-4.1.18/arch/s390/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/s390/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -653,6 +653,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/s390/include/asm/tlb.h linux-4.1.12-vs2.3.8.3/arch/s390/include/asm/tlb.h
---- linux-4.1.12/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/s390/include/asm/tlb.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/s390/include/asm/tlb.h linux-4.1.18-vs2.3.8.4/arch/s390/include/asm/tlb.h
+--- linux-4.1.18/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/s390/include/asm/tlb.h 2015-07-06 20:43:43.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-4.1.12/arch/s390/include/uapi/asm/unistd.h linux-4.1.12-vs2.3.8.3/arch/s390/include/uapi/asm/unistd.h
---- linux-4.1.12/arch/s390/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/s390/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/s390/include/uapi/asm/unistd.h linux-4.1.18-vs2.3.8.4/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.1.18/arch/s390/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/s390/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.1.12/arch/s390/kernel/ptrace.c linux-4.1.12-vs2.3.8.3/arch/s390/kernel/ptrace.c
---- linux-4.1.12/arch/s390/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/s390/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/s390/kernel/ptrace.c linux-4.1.18-vs2.3.8.4/arch/s390/kernel/ptrace.c
+--- linux-4.1.18/arch/s390/kernel/ptrace.c 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/s390/kernel/ptrace.c 2015-07-06 20:43:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-4.1.12/arch/s390/kernel/syscalls.S linux-4.1.12-vs2.3.8.3/arch/s390/kernel/syscalls.S
---- linux-4.1.12/arch/s390/kernel/syscalls.S 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/s390/kernel/syscalls.S 2015-07-06 20:46:54.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/s390/kernel/syscalls.S linux-4.1.18-vs2.3.8.4/arch/s390/kernel/syscalls.S
+--- linux-4.1.18/arch/s390/kernel/syscalls.S 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/s390/kernel/syscalls.S 2015-07-06 20:46:54.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)
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.1.12/arch/sh/Kconfig linux-4.1.12-vs2.3.8.3/arch/sh/Kconfig
---- linux-4.1.12/arch/sh/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sh/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sh/Kconfig linux-4.1.18-vs2.3.8.4/arch/sh/Kconfig
+--- linux-4.1.18/arch/sh/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sh/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -882,6 +882,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/sh/kernel/irq.c linux-4.1.12-vs2.3.8.3/arch/sh/kernel/irq.c
---- linux-4.1.12/arch/sh/kernel/irq.c 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sh/kernel/irq.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sh/kernel/irq.c linux-4.1.18-vs2.3.8.4/arch/sh/kernel/irq.c
+--- linux-4.1.18/arch/sh/kernel/irq.c 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sh/kernel/irq.c 2015-07-06 20:43:43.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-4.1.12/arch/sparc/Kconfig linux-4.1.12-vs2.3.8.3/arch/sparc/Kconfig
---- linux-4.1.12/arch/sparc/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sparc/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sparc/Kconfig linux-4.1.18-vs2.3.8.4/arch/sparc/Kconfig
+--- linux-4.1.18/arch/sparc/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sparc/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -564,6 +564,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/sparc/include/uapi/asm/unistd.h linux-4.1.12-vs2.3.8.3/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.1.12/arch/sparc/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sparc/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sparc/include/uapi/asm/unistd.h linux-4.1.18-vs2.3.8.4/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.1.18/arch/sparc/include/uapi/asm/unistd.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sparc/include/uapi/asm/unistd.h 2015-07-06 20:43:43.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-4.1.12/arch/sparc/kernel/systbls_32.S linux-4.1.12-vs2.3.8.3/arch/sparc/kernel/systbls_32.S
---- linux-4.1.12/arch/sparc/kernel/systbls_32.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sparc/kernel/systbls_32.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sparc/kernel/systbls_32.S linux-4.1.18-vs2.3.8.4/arch/sparc/kernel/systbls_32.S
+--- linux-4.1.18/arch/sparc/kernel/systbls_32.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sparc/kernel/systbls_32.S 2015-07-06 20:43:43.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
/*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.1.12/arch/sparc/kernel/systbls_64.S linux-4.1.12-vs2.3.8.3/arch/sparc/kernel/systbls_64.S
---- linux-4.1.12/arch/sparc/kernel/systbls_64.S 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/sparc/kernel/systbls_64.S 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/sparc/kernel/systbls_64.S linux-4.1.18-vs2.3.8.4/arch/sparc/kernel/systbls_64.S
+--- linux-4.1.18/arch/sparc/kernel/systbls_64.S 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/sparc/kernel/systbls_64.S 2015-07-06 20:43:43.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
/*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.1.12/arch/um/Kconfig.rest linux-4.1.12-vs2.3.8.3/arch/um/Kconfig.rest
---- linux-4.1.12/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/um/Kconfig.rest 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/um/Kconfig.rest linux-4.1.18-vs2.3.8.4/arch/um/Kconfig.rest
+--- linux-4.1.18/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/um/Kconfig.rest 2015-07-06 20:43:43.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/x86/Kconfig linux-4.1.12-vs2.3.8.3/arch/x86/Kconfig
---- linux-4.1.12/arch/x86/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/x86/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/x86/Kconfig linux-4.1.18-vs2.3.8.4/arch/x86/Kconfig
+--- linux-4.1.18/arch/x86/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/x86/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -2587,6 +2587,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.1.12/arch/x86/syscalls/syscall_32.tbl linux-4.1.12-vs2.3.8.3/arch/x86/syscalls/syscall_32.tbl
---- linux-4.1.12/arch/x86/syscalls/syscall_32.tbl 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/x86/syscalls/syscall_32.tbl 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/x86/syscalls/syscall_32.tbl linux-4.1.18-vs2.3.8.4/arch/x86/syscalls/syscall_32.tbl
+--- linux-4.1.18/arch/x86/syscalls/syscall_32.tbl 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/x86/syscalls/syscall_32.tbl 2015-07-06 20:43:43.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
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.1.12/arch/x86/syscalls/syscall_64.tbl linux-4.1.12-vs2.3.8.3/arch/x86/syscalls/syscall_64.tbl
---- linux-4.1.12/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/arch/x86/syscalls/syscall_64.tbl linux-4.1.18-vs2.3.8.4/arch/x86/syscalls/syscall_64.tbl
+--- linux-4.1.18/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/arch/x86/syscalls/syscall_64.tbl 2015-07-06 20:43:43.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-4.1.12/block/ioprio.c linux-4.1.12-vs2.3.8.3/block/ioprio.c
---- linux-4.1.12/block/ioprio.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/block/ioprio.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/block/ioprio.c linux-4.1.18-vs2.3.8.4/block/ioprio.c
+--- linux-4.1.18/block/ioprio.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/block/ioprio.c 2015-07-06 20:43:43.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-4.1.12/drivers/block/Kconfig linux-4.1.12-vs2.3.8.3/drivers/block/Kconfig
---- linux-4.1.12/drivers/block/Kconfig 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/block/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/block/Kconfig linux-4.1.18-vs2.3.8.4/drivers/block/Kconfig
+--- linux-4.1.18/drivers/block/Kconfig 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/block/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -283,6 +283,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-4.1.12/drivers/block/Makefile linux-4.1.12-vs2.3.8.3/drivers/block/Makefile
---- linux-4.1.12/drivers/block/Makefile 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/block/Makefile 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/block/Makefile linux-4.1.18-vs2.3.8.4/drivers/block/Makefile
+--- linux-4.1.18/drivers/block/Makefile 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/block/Makefile 2015-07-06 20:43:43.000000000 +0000
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-4.1.12/drivers/block/loop.c linux-4.1.12-vs2.3.8.3/drivers/block/loop.c
---- linux-4.1.12/drivers/block/loop.c 2015-10-29 09:20:05.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/block/loop.c 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/block/loop.c linux-4.1.18-vs2.3.8.4/drivers/block/loop.c
+--- linux-4.1.18/drivers/block/loop.c 2016-02-18 18:01:41.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/block/loop.c 2015-10-29 09:25:25.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-4.1.12/drivers/block/loop.h linux-4.1.12-vs2.3.8.3/drivers/block/loop.h
---- linux-4.1.12/drivers/block/loop.h 2015-10-29 09:20:05.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/block/loop.h 2015-10-29 09:25:25.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/block/loop.h linux-4.1.18-vs2.3.8.4/drivers/block/loop.h
+--- linux-4.1.18/drivers/block/loop.h 2016-02-18 18:01:41.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/block/loop.h 2015-10-29 09:25:25.000000000 +0000
@@ -43,6 +43,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-4.1.12/drivers/block/vroot.c linux-4.1.12-vs2.3.8.3/drivers/block/vroot.c
---- linux-4.1.12/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/block/vroot.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/block/vroot.c linux-4.1.18-vs2.3.8.4/drivers/block/vroot.c
+--- linux-4.1.18/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/block/vroot.c 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6.10 by Herbert P?tzl, 30/12/2004
+ *
+ * based on the loop.c code by Theodore Ts'o.
+ *
-+ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ *
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR);
+
-+MODULE_AUTHOR ("Herbert Pötzl");
++MODULE_AUTHOR ("Herbert P?tzl");
+MODULE_DESCRIPTION ("Virtual Root Device Mapper");
+
+
+
+#endif
+
-diff -NurpP --minimal linux-4.1.12/drivers/infiniband/core/addr.c linux-4.1.12-vs2.3.8.3/drivers/infiniband/core/addr.c
---- linux-4.1.12/drivers/infiniband/core/addr.c 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/infiniband/core/addr.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/infiniband/core/addr.c linux-4.1.18-vs2.3.8.4/drivers/infiniband/core/addr.c
+--- linux-4.1.18/drivers/infiniband/core/addr.c 2015-07-06 20:41:38.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/infiniband/core/addr.c 2015-07-06 20:43:43.000000000 +0000
@@ -284,7 +284,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-4.1.12/drivers/md/dm-ioctl.c linux-4.1.12-vs2.3.8.3/drivers/md/dm-ioctl.c
---- linux-4.1.12/drivers/md/dm-ioctl.c 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/md/dm-ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/md/dm-ioctl.c linux-4.1.18-vs2.3.8.4/drivers/md/dm-ioctl.c
+--- linux-4.1.18/drivers/md/dm-ioctl.c 2015-07-06 20:41:38.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/md/dm-ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-4.1.12/drivers/md/dm.c linux-4.1.12-vs2.3.8.3/drivers/md/dm.c
---- linux-4.1.12/drivers/md/dm.c 2015-10-29 09:20:07.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/md/dm.c 2015-10-29 09:25:26.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/md/dm.c linux-4.1.18-vs2.3.8.4/drivers/md/dm.c
+--- linux-4.1.18/drivers/md/dm.c 2016-02-18 18:01:45.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/md/dm.c 2015-10-29 09:25:26.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/ktime.h>
#include <linux/elevator.h> /* for rq_end_sector() */
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-4.1.12/drivers/md/dm.h linux-4.1.12-vs2.3.8.3/drivers/md/dm.h
---- linux-4.1.12/drivers/md/dm.h 2015-07-06 20:41:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/md/dm.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/md/dm.h linux-4.1.18-vs2.3.8.4/drivers/md/dm.h
+--- linux-4.1.18/drivers/md/dm.h 2015-07-06 20:41:38.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/md/dm.h 2015-07-06 20:43:43.000000000 +0000
@@ -51,6 +51,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.1.12/drivers/net/tun.c linux-4.1.12-vs2.3.8.3/drivers/net/tun.c
---- linux-4.1.12/drivers/net/tun.c 2015-07-06 20:41:39.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/net/tun.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/net/tun.c linux-4.1.18-vs2.3.8.4/drivers/net/tun.c
+--- linux-4.1.18/drivers/net/tun.c 2015-07-06 20:41:39.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/net/tun.c 2015-07-06 20:43:43.000000000 +0000
@@ -65,6 +65,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-4.1.12/drivers/scsi/cxgbi/libcxgbi.c linux-4.1.12-vs2.3.8.3/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.1.12/drivers/scsi/cxgbi/libcxgbi.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/scsi/cxgbi/libcxgbi.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/scsi/cxgbi/libcxgbi.c linux-4.1.18-vs2.3.8.4/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.1.18/drivers/scsi/cxgbi/libcxgbi.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/scsi/cxgbi/libcxgbi.c 2015-07-06 20:43:43.000000000 +0000
@@ -764,7 +764,8 @@ static struct cxgbi_sock *cxgbi_check_ro
struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt);
if (err) {
pr_info("failed to get source address to reach %pI6\n",
&daddr6->sin6_addr);
-diff -NurpP --minimal linux-4.1.12/drivers/tty/sysrq.c linux-4.1.12-vs2.3.8.3/drivers/tty/sysrq.c
---- linux-4.1.12/drivers/tty/sysrq.c 2015-10-29 09:20:31.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/tty/sysrq.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/tty/sysrq.c linux-4.1.18-vs2.3.8.4/drivers/tty/sysrq.c
+--- linux-4.1.18/drivers/tty/sysrq.c 2016-02-18 18:01:53.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/tty/sysrq.c 2015-10-29 09:25:27.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.1.12/drivers/tty/tty_io.c linux-4.1.12-vs2.3.8.3/drivers/tty/tty_io.c
---- linux-4.1.12/drivers/tty/tty_io.c 2015-10-29 09:20:31.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/drivers/tty/tty_io.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/drivers/tty/tty_io.c linux-4.1.18-vs2.3.8.4/drivers/tty/tty_io.c
+--- linux-4.1.18/drivers/tty/tty_io.c 2016-02-18 18:01:53.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/drivers/tty/tty_io.c 2016-02-19 03:14:23.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
#undef TTY_DEBUG_HANGUP
-@@ -2283,7 +2284,8 @@ static int tiocsti(struct tty_struct *tt
+@@ -2287,7 +2288,8 @@ static int tiocsti(struct tty_struct *tt
char ch, mbz = 0;
struct tty_ldisc *ld;
return -EPERM;
if (get_user(ch, p))
return -EFAULT;
-@@ -2597,6 +2599,7 @@ static int tiocspgrp(struct tty_struct *
+@@ -2601,6 +2603,7 @@ static int tiocspgrp(struct tty_struct *
return -ENOTTY;
if (get_user(pgrp_nr, p))
return -EFAULT;
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.1.12/fs/attr.c linux-4.1.12-vs2.3.8.3/fs/attr.c
---- linux-4.1.12/fs/attr.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/attr.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/attr.c linux-4.1.18-vs2.3.8.4/fs/attr.c
+--- linux-4.1.18/fs/attr.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/attr.c 2015-07-06 20:43:43.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-4.1.12/fs/block_dev.c linux-4.1.12-vs2.3.8.3/fs/block_dev.c
---- linux-4.1.12/fs/block_dev.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/block_dev.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/block_dev.c linux-4.1.18-vs2.3.8.4/fs/block_dev.c
+--- linux-4.1.18/fs/block_dev.c 2016-02-18 18:01:54.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/block_dev.c 2015-10-29 09:25:27.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.1.12/fs/btrfs/ctree.h linux-4.1.12-vs2.3.8.3/fs/btrfs/ctree.h
---- linux-4.1.12/fs/btrfs/ctree.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/btrfs/ctree.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/btrfs/ctree.h linux-4.1.18-vs2.3.8.4/fs/btrfs/ctree.h
+--- linux-4.1.18/fs/btrfs/ctree.h 2016-02-18 18:01:54.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/btrfs/ctree.h 2016-02-19 03:14:23.000000000 +0000
@@ -731,11 +731,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
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.1.12/fs/btrfs/disk-io.c linux-4.1.12-vs2.3.8.3/fs/btrfs/disk-io.c
---- linux-4.1.12/fs/btrfs/disk-io.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/btrfs/disk-io.c 2015-07-06 20:43:43.000000000 +0000
-@@ -2668,6 +2668,9 @@ int open_ctree(struct super_block *sb,
+diff -NurpP --minimal linux-4.1.18/fs/btrfs/disk-io.c linux-4.1.18-vs2.3.8.4/fs/btrfs/disk-io.c
+--- linux-4.1.18/fs/btrfs/disk-io.c 2016-02-18 18:01:54.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/btrfs/disk-io.c 2016-02-19 03:14:23.000000000 +0000
+@@ -2671,6 +2671,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-4.1.12/fs/btrfs/inode.c linux-4.1.12-vs2.3.8.3/fs/btrfs/inode.c
---- linux-4.1.12/fs/btrfs/inode.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/btrfs/inode.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/btrfs/inode.c linux-4.1.18-vs2.3.8.4/fs/btrfs/inode.c
+--- linux-4.1.18/fs/btrfs/inode.c 2016-02-18 18:01:55.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/btrfs/inode.c 2016-02-19 03:14:23.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
-@@ -3583,6 +3584,9 @@ static void btrfs_read_locked_inode(stru
+@@ -3579,6 +3580,9 @@ static void btrfs_read_locked_inode(stru
unsigned long ptr;
int maybe_acls;
u32 rdev;
int ret;
bool filled = false;
int first_xattr_slot;
-@@ -3610,8 +3614,14 @@ static void btrfs_read_locked_inode(stru
+@@ -3606,8 +3610,14 @@ static void btrfs_read_locked_inode(stru
struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(leaf, inode_item);
set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime);
-@@ -3738,11 +3748,18 @@ static void fill_inode_item(struct btrfs
+@@ -3734,11 +3744,18 @@ static void fill_inode_item(struct btrfs
struct inode *inode)
{
struct btrfs_map_token token;
btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size,
&token);
btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token);
-@@ -9794,6 +9811,7 @@ static const struct inode_operations btr
+@@ -9846,6 +9863,7 @@ static const struct inode_operations btr
.listxattr = btrfs_listxattr,
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -9802,6 +9820,7 @@ static const struct inode_operations btr
+@@ -9854,6 +9872,7 @@ static const struct inode_operations btr
static const struct inode_operations btrfs_dir_ro_inode_operations = {
.lookup = btrfs_lookup,
.permission = btrfs_permission,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-@@ -9872,6 +9891,7 @@ static const struct inode_operations btr
+@@ -9924,6 +9943,7 @@ static const struct inode_operations btr
.removexattr = btrfs_removexattr,
.permission = btrfs_permission,
.fiemap = btrfs_fiemap,
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.1.12/fs/btrfs/ioctl.c linux-4.1.12-vs2.3.8.3/fs/btrfs/ioctl.c
---- linux-4.1.12/fs/btrfs/ioctl.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/btrfs/ioctl.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/btrfs/ioctl.c linux-4.1.18-vs2.3.8.4/fs/btrfs/ioctl.c
+--- linux-4.1.18/fs/btrfs/ioctl.c 2016-02-18 18:01:55.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/btrfs/ioctl.c 2016-02-19 03:14:23.000000000 +0000
@@ -107,10 +107,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-4.1.12/fs/btrfs/super.c linux-4.1.12-vs2.3.8.3/fs/btrfs/super.c
---- linux-4.1.12/fs/btrfs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/btrfs/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/btrfs/super.c linux-4.1.18-vs2.3.8.4/fs/btrfs/super.c
+--- linux-4.1.18/fs/btrfs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/btrfs/super.c 2015-07-06 20:43:43.000000000 +0000
@@ -325,7 +325,7 @@ enum {
Opt_commit_interval, Opt_barrier, Opt_nodefrag, Opt_nodiscard,
Opt_noenospc_debug, Opt_noflushoncommit, Opt_acl, Opt_datacow,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.1.12/fs/char_dev.c linux-4.1.12-vs2.3.8.3/fs/char_dev.c
---- linux-4.1.12/fs/char_dev.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/char_dev.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/char_dev.c linux-4.1.18-vs2.3.8.4/fs/char_dev.c
+--- linux-4.1.18/fs/char_dev.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/char_dev.c 2015-07-06 20:43:43.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-4.1.12/fs/dcache.c linux-4.1.12-vs2.3.8.3/fs/dcache.c
---- linux-4.1.12/fs/dcache.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/dcache.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/dcache.c linux-4.1.18-vs2.3.8.4/fs/dcache.c
+--- linux-4.1.18/fs/dcache.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/dcache.c 2015-10-29 09:25:27.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-4.1.12/fs/devpts/inode.c linux-4.1.12-vs2.3.8.3/fs/devpts/inode.c
---- linux-4.1.12/fs/devpts/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/devpts/inode.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/devpts/inode.c linux-4.1.18-vs2.3.8.4/fs/devpts/inode.c
+--- linux-4.1.18/fs/devpts/inode.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/devpts/inode.c 2015-07-06 20:43:43.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-4.1.12/fs/ext2/balloc.c linux-4.1.12-vs2.3.8.3/fs/ext2/balloc.c
---- linux-4.1.12/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/balloc.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/balloc.c linux-4.1.18-vs2.3.8.4/fs/ext2/balloc.c
+--- linux-4.1.18/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/balloc.c 2015-07-06 20:43:43.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-4.1.12/fs/ext2/ext2.h linux-4.1.12-vs2.3.8.3/fs/ext2/ext2.h
---- linux-4.1.12/fs/ext2/ext2.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/ext2.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/ext2.h linux-4.1.18-vs2.3.8.4/fs/ext2/ext2.h
+--- linux-4.1.18/fs/ext2/ext2.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/ext2.h 2015-07-06 20:43:43.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) */
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.1.12/fs/ext2/file.c linux-4.1.12-vs2.3.8.3/fs/ext2/file.c
---- linux-4.1.12/fs/ext2/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/file.c linux-4.1.18-vs2.3.8.4/fs/ext2/file.c
+--- linux-4.1.18/fs/ext2/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -118,4 +118,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.1.12/fs/ext2/ialloc.c linux-4.1.12-vs2.3.8.3/fs/ext2/ialloc.c
---- linux-4.1.12/fs/ext2/ialloc.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/ialloc.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/ialloc.c linux-4.1.18-vs2.3.8.4/fs/ext2/ialloc.c
+--- linux-4.1.18/fs/ext2/ialloc.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/ialloc.c 2015-07-06 20:43:43.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.1.12/fs/ext2/inode.c linux-4.1.12-vs2.3.8.3/fs/ext2/inode.c
---- linux-4.1.12/fs/ext2/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/inode.c 2015-07-06 21:27:56.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/inode.c linux-4.1.18-vs2.3.8.4/fs/ext2/inode.c
+--- linux-4.1.18/fs/ext2/inode.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/inode.c 2015-07-06 21:27:56.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.1.12/fs/ext2/ioctl.c linux-4.1.12-vs2.3.8.3/fs/ext2/ioctl.c
---- linux-4.1.12/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/ioctl.c linux-4.1.18-vs2.3.8.4/fs/ext2/ioctl.c
+--- linux-4.1.18/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.1.12/fs/ext2/namei.c linux-4.1.12-vs2.3.8.3/fs/ext2/namei.c
---- linux-4.1.12/fs/ext2/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/namei.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/namei.c linux-4.1.18-vs2.3.8.4/fs/ext2/namei.c
+--- linux-4.1.18/fs/ext2/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/namei.c 2015-07-06 20:43:43.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.1.12/fs/ext2/super.c linux-4.1.12-vs2.3.8.3/fs/ext2/super.c
---- linux-4.1.12/fs/ext2/super.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext2/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext2/super.c linux-4.1.18-vs2.3.8.4/fs/ext2/super.c
+--- linux-4.1.18/fs/ext2/super.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext2/super.c 2015-07-06 20:43:43.000000000 +0000
@@ -405,7 +405,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.12/fs/ext3/ext3.h linux-4.1.12-vs2.3.8.3/fs/ext3/ext3.h
---- linux-4.1.12/fs/ext3/ext3.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/ext3.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/ext3.h linux-4.1.18-vs2.3.8.4/fs/ext3/ext3.h
+--- linux-4.1.18/fs/ext3/ext3.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/ext3.h 2015-07-06 20:43:43.000000000 +0000
@@ -151,10 +151,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-4.1.12/fs/ext3/file.c linux-4.1.12-vs2.3.8.3/fs/ext3/file.c
---- linux-4.1.12/fs/ext3/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/file.c linux-4.1.18-vs2.3.8.4/fs/ext3/file.c
+--- linux-4.1.18/fs/ext3/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -75,5 +75,6 @@ const struct inode_operations ext3_file_
.get_acl = ext3_get_acl,
.set_acl = ext3_set_acl,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-4.1.12/fs/ext3/ialloc.c linux-4.1.12-vs2.3.8.3/fs/ext3/ialloc.c
---- linux-4.1.12/fs/ext3/ialloc.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/ialloc.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/ialloc.c linux-4.1.18-vs2.3.8.4/fs/ext3/ialloc.c
+--- linux-4.1.18/fs/ext3/ialloc.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/ialloc.c 2015-07-06 20:43:43.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-4.1.12/fs/ext3/inode.c linux-4.1.12-vs2.3.8.3/fs/ext3/inode.c
---- linux-4.1.12/fs/ext3/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/inode.c 2015-07-06 21:27:33.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/inode.c linux-4.1.18-vs2.3.8.4/fs/ext3/inode.c
+--- linux-4.1.18/fs/ext3/inode.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/inode.c 2015-07-06 21:27:33.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/mpage.h>
#include <linux/namei.h>
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.1.12/fs/ext3/ioctl.c linux-4.1.12-vs2.3.8.3/fs/ext3/ioctl.c
---- linux-4.1.12/fs/ext3/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/ioctl.c linux-4.1.18-vs2.3.8.4/fs/ext3/ioctl.c
+--- linux-4.1.18/fs/ext3/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.1.12/fs/ext3/namei.c linux-4.1.12-vs2.3.8.3/fs/ext3/namei.c
---- linux-4.1.12/fs/ext3/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/namei.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/namei.c linux-4.1.18-vs2.3.8.4/fs/ext3/namei.c
+--- linux-4.1.18/fs/ext3/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/namei.c 2015-07-06 20:43:43.000000000 +0000
@@ -25,6 +25,8 @@
*/
.get_acl = ext3_get_acl,
.set_acl = ext3_set_acl,
};
-diff -NurpP --minimal linux-4.1.12/fs/ext3/super.c linux-4.1.12-vs2.3.8.3/fs/ext3/super.c
---- linux-4.1.12/fs/ext3/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext3/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext3/super.c linux-4.1.18-vs2.3.8.4/fs/ext3/super.c
+--- linux-4.1.18/fs/ext3/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext3/super.c 2015-07-06 20:43:43.000000000 +0000
@@ -837,7 +837,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.12/fs/ext4/ext4.h linux-4.1.12-vs2.3.8.3/fs/ext4/ext4.h
---- linux-4.1.12/fs/ext4/ext4.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/ext4.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/ext4.h linux-4.1.18-vs2.3.8.4/fs/ext4/ext4.h
+--- linux-4.1.18/fs/ext4/ext4.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/ext4.h 2015-07-06 20:43:43.000000000 +0000
@@ -377,7 +377,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
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.1.12/fs/ext4/file.c linux-4.1.12-vs2.3.8.3/fs/ext4/file.c
---- linux-4.1.12/fs/ext4/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/file.c linux-4.1.18-vs2.3.8.4/fs/ext4/file.c
+--- linux-4.1.18/fs/ext4/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -647,5 +647,6 @@ const struct inode_operations ext4_file_
.get_acl = ext4_get_acl,
.set_acl = ext4_set_acl,
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-4.1.12/fs/ext4/ialloc.c linux-4.1.12-vs2.3.8.3/fs/ext4/ialloc.c
---- linux-4.1.12/fs/ext4/ialloc.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/ialloc.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/ialloc.c linux-4.1.18-vs2.3.8.4/fs/ext4/ialloc.c
+--- linux-4.1.18/fs/ext4/ialloc.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/ialloc.c 2015-07-06 20:43:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-4.1.12/fs/ext4/inode.c linux-4.1.12-vs2.3.8.3/fs/ext4/inode.c
---- linux-4.1.12/fs/ext4/inode.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/inode.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/inode.c linux-4.1.18-vs2.3.8.4/fs/ext4/inode.c
+--- linux-4.1.18/fs/ext4/inode.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/inode.c 2015-10-29 09:25:27.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/printk.h>
#include <linux/slab.h>
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-4.1.12/fs/ext4/ioctl.c linux-4.1.12-vs2.3.8.3/fs/ext4/ioctl.c
---- linux-4.1.12/fs/ext4/ioctl.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/ioctl.c 2015-07-06 21:28:42.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/ioctl.c linux-4.1.18-vs2.3.8.4/fs/ext4/ioctl.c
+--- linux-4.1.18/fs/ext4/ioctl.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/ioctl.c 2015-07-06 21:28:42.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/mount.h>
#include <linux/file.h>
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-4.1.12/fs/ext4/namei.c linux-4.1.12-vs2.3.8.3/fs/ext4/namei.c
---- linux-4.1.12/fs/ext4/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/namei.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ext4/namei.c linux-4.1.18-vs2.3.8.4/fs/ext4/namei.c
+--- linux-4.1.18/fs/ext4/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/namei.c 2015-07-06 20:43:43.000000000 +0000
@@ -33,6 +33,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-4.1.12/fs/ext4/super.c linux-4.1.12-vs2.3.8.3/fs/ext4/super.c
---- linux-4.1.12/fs/ext4/super.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ext4/super.c 2015-10-29 09:25:27.000000000 +0000
-@@ -1137,6 +1137,7 @@ enum {
+diff -NurpP --minimal linux-4.1.18/fs/ext4/super.c linux-4.1.18-vs2.3.8.4/fs/ext4/super.c
+--- linux-4.1.18/fs/ext4/super.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ext4/super.c 2016-02-19 03:14:23.000000000 +0000
+@@ -1145,6 +1145,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
Opt_max_dir_size_kb, Opt_nojournal_checksum,
};
static const match_table_t tokens = {
-@@ -1222,6 +1223,9 @@ static const match_table_t tokens = {
+@@ -1230,6 +1231,9 @@ static const match_table_t tokens = {
{Opt_removed, "reservation"}, /* mount option from ext2/3 */
{Opt_removed, "noreservation"}, /* mount option from ext2/3 */
{Opt_removed, "journal=%u"}, /* mount option from ext2/3 */
{Opt_err, NULL},
};
-@@ -1464,6 +1468,20 @@ static int handle_mount_opt(struct super
+@@ -1472,6 +1476,20 @@ static int handle_mount_opt(struct super
case Opt_nolazytime:
sb->s_flags &= ~MS_LAZYTIME;
return 1;
}
for (m = ext4_mount_opts; m->token != Opt_err; m++)
-@@ -3643,6 +3661,9 @@ static int ext4_fill_super(struct super_
+@@ -3651,6 +3669,9 @@ static int ext4_fill_super(struct super_
clear_opt(sb, DELALLOC);
}
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-@@ -4954,6 +4975,14 @@ static int ext4_remount(struct super_blo
+@@ -4962,6 +4983,14 @@ static int ext4_remount(struct super_blo
if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
ext4_abort(sb, "Abort forced by user");
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.1.12/fs/fcntl.c linux-4.1.12-vs2.3.8.3/fs/fcntl.c
---- linux-4.1.12/fs/fcntl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/fcntl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/fcntl.c linux-4.1.18-vs2.3.8.4/fs/fcntl.c
+--- linux-4.1.18/fs/fcntl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/fcntl.c 2015-07-06 20:43:43.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/pid_namespace.h>
#include <linux/user_namespace.h>
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-4.1.12/fs/file.c linux-4.1.12-vs2.3.8.3/fs/file.c
---- linux-4.1.12/fs/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/file.c linux-4.1.18-vs2.3.8.4/fs/file.c
+--- linux-4.1.18/fs/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
return fd;
-diff -NurpP --minimal linux-4.1.12/fs/file_table.c linux-4.1.12-vs2.3.8.3/fs/file_table.c
---- linux-4.1.12/fs/file_table.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/file_table.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/file_table.c linux-4.1.18-vs2.3.8.4/fs/file_table.c
+--- linux-4.1.18/fs/file_table.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/file_table.c 2015-07-06 20:43:43.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
file_free(file);
}
}
-diff -NurpP --minimal linux-4.1.12/fs/fs_struct.c linux-4.1.12-vs2.3.8.3/fs/fs_struct.c
---- linux-4.1.12/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/fs_struct.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/fs_struct.c linux-4.1.18-vs2.3.8.4/fs/fs_struct.c
+--- linux-4.1.18/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/fs_struct.c 2015-07-06 20:43:43.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-4.1.12/fs/gfs2/file.c linux-4.1.12-vs2.3.8.3/fs/gfs2/file.c
---- linux-4.1.12/fs/gfs2/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/gfs2/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/gfs2/file.c linux-4.1.18-vs2.3.8.4/fs/gfs2/file.c
+--- linux-4.1.18/fs/gfs2/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/gfs2/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-4.1.12/fs/gfs2/inode.h linux-4.1.12-vs2.3.8.3/fs/gfs2/inode.h
---- linux-4.1.12/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/gfs2/inode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/gfs2/inode.h linux-4.1.18-vs2.3.8.4/fs/gfs2/inode.h
+--- linux-4.1.18/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/gfs2/inode.h 2015-07-06 20:43:43.000000000 +0000
@@ -118,6 +118,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-4.1.12/fs/hostfs/hostfs.h linux-4.1.12-vs2.3.8.3/fs/hostfs/hostfs.h
---- linux-4.1.12/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/hostfs/hostfs.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/hostfs/hostfs.h linux-4.1.18-vs2.3.8.4/fs/hostfs/hostfs.h
+--- linux-4.1.18/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/hostfs/hostfs.h 2015-07-06 20:43:43.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-4.1.12/fs/inode.c linux-4.1.12-vs2.3.8.3/fs/inode.c
---- linux-4.1.12/fs/inode.c 2015-10-29 09:20:32.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/inode.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/inode.c linux-4.1.18-vs2.3.8.4/fs/inode.c
+--- linux-4.1.18/fs/inode.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/inode.c 2015-07-24 14:11:50.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/buffer_head.h> /* for inode_has_buffers */
#include <linux/ratelimit.h>
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-4.1.12/fs/ioctl.c linux-4.1.12-vs2.3.8.3/fs/ioctl.c
---- linux-4.1.12/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ioctl.c linux-4.1.18-vs2.3.8.4/fs/ioctl.c
+--- linux-4.1.18/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.1.12/fs/jfs/file.c linux-4.1.12-vs2.3.8.3/fs/jfs/file.c
---- linux-4.1.12/fs/jfs/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/file.c linux-4.1.18-vs2.3.8.4/fs/jfs/file.c
+--- linux-4.1.18/fs/jfs/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -110,7 +110,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.1.12/fs/jfs/ioctl.c linux-4.1.12-vs2.3.8.3/fs/jfs/ioctl.c
---- linux-4.1.12/fs/jfs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/ioctl.c linux-4.1.18-vs2.3.8.4/fs/jfs/ioctl.c
+--- linux-4.1.18/fs/jfs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-4.1.12/fs/jfs/jfs_dinode.h linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_dinode.h
---- linux-4.1.12/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_dinode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/jfs_dinode.h linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_dinode.h
+--- linux-4.1.18/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_dinode.h 2015-07-06 20:43:43.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-4.1.12/fs/jfs/jfs_filsys.h linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_filsys.h
---- linux-4.1.12/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_filsys.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/jfs_filsys.h linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_filsys.h
+--- linux-4.1.18/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_filsys.h 2015-07-06 20:43:43.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.1.12/fs/jfs/jfs_imap.c linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_imap.c
---- linux-4.1.12/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_imap.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/jfs_imap.c linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_imap.c
+--- linux-4.1.18/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_imap.c 2015-07-06 20:43:43.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-4.1.12/fs/jfs/jfs_inode.c linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_inode.c
---- linux-4.1.12/fs/jfs/jfs_inode.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_inode.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/jfs_inode.c linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_inode.c
+--- linux-4.1.18/fs/jfs/jfs_inode.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_inode.c 2015-07-06 20:43:43.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-4.1.12/fs/jfs/jfs_inode.h linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_inode.h
---- linux-4.1.12/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/jfs_inode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/jfs_inode.h linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_inode.h
+--- linux-4.1.18/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/jfs_inode.h 2015-07-06 20:43:43.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);
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.1.12/fs/jfs/namei.c linux-4.1.12-vs2.3.8.3/fs/jfs/namei.c
---- linux-4.1.12/fs/jfs/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/namei.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/namei.c linux-4.1.18-vs2.3.8.4/fs/jfs/namei.c
+--- linux-4.1.18/fs/jfs/namei.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/namei.c 2015-07-06 20:43:43.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.1.12/fs/jfs/super.c linux-4.1.12-vs2.3.8.3/fs/jfs/super.c
---- linux-4.1.12/fs/jfs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/jfs/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/jfs/super.c linux-4.1.18-vs2.3.8.4/fs/jfs/super.c
+--- linux-4.1.18/fs/jfs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/jfs/super.c 2015-07-06 20:43:43.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,
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-4.1.12/fs/libfs.c linux-4.1.12-vs2.3.8.3/fs/libfs.c
---- linux-4.1.12/fs/libfs.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/libfs.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/libfs.c linux-4.1.18-vs2.3.8.4/fs/libfs.c
+--- linux-4.1.18/fs/libfs.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/libfs.c 2015-10-29 09:25:27.000000000 +0000
@@ -146,13 +146,14 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos)
{
return -EISDIR;
-diff -NurpP --minimal linux-4.1.12/fs/locks.c linux-4.1.12-vs2.3.8.3/fs/locks.c
---- linux-4.1.12/fs/locks.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/locks.c 2015-10-30 13:33:17.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/locks.c linux-4.1.18-vs2.3.8.4/fs/locks.c
+--- linux-4.1.18/fs/locks.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/locks.c 2016-02-19 03:14:23.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2277,6 +2316,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -2279,6 +2318,11 @@ int fcntl_setlk64(unsigned int fd, struc
if (file_lock == NULL)
return -ENOLCK;
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2582,8 +2626,11 @@ static int locks_show(struct seq_file *f
+@@ -2591,8 +2635,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, iter->li_pos, "");
return 0;
}
-diff -NurpP --minimal linux-4.1.12/fs/mount.h linux-4.1.12-vs2.3.8.3/fs/mount.h
---- linux-4.1.12/fs/mount.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/mount.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/mount.h linux-4.1.18-vs2.3.8.4/fs/mount.h
+--- linux-4.1.18/fs/mount.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/mount.h 2015-07-06 20:43:43.000000000 +0000
@@ -65,6 +65,7 @@ struct mount {
struct hlist_head mnt_pins;
struct fs_pin mnt_umount;
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-4.1.12/fs/namei.c linux-4.1.12-vs2.3.8.3/fs/namei.c
---- linux-4.1.12/fs/namei.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/namei.c 2015-10-30 14:46:15.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/namei.c linux-4.1.18-vs2.3.8.4/fs/namei.c
+--- linux-4.1.18/fs/namei.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/namei.c 2015-10-30 14:46:15.000000000 +0000
@@ -34,10 +34,20 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-4.1.12/fs/namespace.c linux-4.1.12-vs2.3.8.3/fs/namespace.c
---- linux-4.1.12/fs/namespace.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/namespace.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/namespace.c linux-4.1.18-vs2.3.8.4/fs/namespace.c
+--- linux-4.1.18/fs/namespace.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/namespace.c 2015-10-29 09:25:27.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.1.12/fs/nfs/client.c linux-4.1.12-vs2.3.8.3/fs/nfs/client.c
---- linux-4.1.12/fs/nfs/client.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfs/client.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfs/client.c linux-4.1.18-vs2.3.8.4/fs/nfs/client.c
+--- linux-4.1.18/fs/nfs/client.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfs/client.c 2016-02-19 03:14:23.000000000 +0000
@@ -692,6 +692,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-4.1.12/fs/nfs/dir.c linux-4.1.12-vs2.3.8.3/fs/nfs/dir.c
---- linux-4.1.12/fs/nfs/dir.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfs/dir.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfs/dir.c linux-4.1.18-vs2.3.8.4/fs/nfs/dir.c
+--- linux-4.1.18/fs/nfs/dir.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfs/dir.c 2015-07-06 20:43:43.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
no_entry:
res = d_splice_alias(inode, dentry);
if (res != NULL) {
-diff -NurpP --minimal linux-4.1.12/fs/nfs/inode.c linux-4.1.12-vs2.3.8.3/fs/nfs/inode.c
---- linux-4.1.12/fs/nfs/inode.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfs/inode.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfs/inode.c linux-4.1.18-vs2.3.8.4/fs/nfs/inode.c
+--- linux-4.1.18/fs/nfs/inode.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfs/inode.c 2016-02-19 03:16:23.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
/* Has the link count changed? */
if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink)
-@@ -1627,6 +1643,9 @@ static int nfs_update_inode(struct inode
+@@ -1628,6 +1644,9 @@ static int nfs_update_inode(struct inode
unsigned long now = jiffies;
unsigned long save_cache_validity;
bool cache_revalidated = true;
dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",
__func__, inode->i_sb->s_id, inode->i_ino,
-@@ -1729,6 +1748,9 @@ static int nfs_update_inode(struct inode
- | NFS_INO_REVAL_PAGECACHE
- | NFS_INO_REVAL_FORCED);
+@@ -1738,6 +1757,9 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
+ }
+ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag);
+ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag);
if (fattr->valid & NFS_ATTR_FATTR_ATIME)
memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
-@@ -1775,6 +1797,10 @@ static int nfs_update_inode(struct inode
- | NFS_INO_INVALID_ACL
- | NFS_INO_REVAL_FORCED);
+@@ -1792,6 +1814,10 @@ static int nfs_update_inode(struct inode
+ cache_revalidated = false;
+ }
+ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid);
+ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid);
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.1.12/fs/nfs/nfs3xdr.c linux-4.1.12-vs2.3.8.3/fs/nfs/nfs3xdr.c
---- linux-4.1.12/fs/nfs/nfs3xdr.c 2015-10-29 09:20:33.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfs/nfs3xdr.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfs/nfs3xdr.c linux-4.1.18-vs2.3.8.4/fs/nfs/nfs3xdr.c
+--- linux-4.1.18/fs/nfs/nfs3xdr.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfs/nfs3xdr.c 2015-10-29 09:25:27.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-4.1.12/fs/nfs/super.c linux-4.1.12-vs2.3.8.3/fs/nfs/super.c
---- linux-4.1.12/fs/nfs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfs/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfs/super.c linux-4.1.18-vs2.3.8.4/fs/nfs/super.c
+--- linux-4.1.18/fs/nfs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfs/super.c 2015-07-06 20:43:43.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
/*
* options that take text values
-diff -NurpP --minimal linux-4.1.12/fs/nfsd/auth.c linux-4.1.12-vs2.3.8.3/fs/nfsd/auth.c
---- linux-4.1.12/fs/nfsd/auth.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfsd/auth.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfsd/auth.c linux-4.1.18-vs2.3.8.4/fs/nfsd/auth.c
+--- linux-4.1.18/fs/nfsd/auth.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfsd/auth.c 2015-07-06 20:43:43.000000000 +0000
@@ -1,6 +1,7 @@
/* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-4.1.12/fs/nfsd/nfs3xdr.c linux-4.1.12-vs2.3.8.3/fs/nfsd/nfs3xdr.c
---- linux-4.1.12/fs/nfsd/nfs3xdr.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfsd/nfs3xdr.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfsd/nfs3xdr.c linux-4.1.18-vs2.3.8.4/fs/nfsd/nfs3xdr.c
+--- linux-4.1.18/fs/nfsd/nfs3xdr.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfsd/nfs3xdr.c 2015-07-06 20:43:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-4.1.12/fs/nfsd/nfs4xdr.c linux-4.1.12-vs2.3.8.3/fs/nfsd/nfs4xdr.c
---- linux-4.1.12/fs/nfsd/nfs4xdr.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfsd/nfs4xdr.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfsd/nfs4xdr.c linux-4.1.18-vs2.3.8.4/fs/nfsd/nfs4xdr.c
+--- linux-4.1.18/fs/nfsd/nfs4xdr.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfsd/nfs4xdr.c 2015-10-29 09:25:27.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.1.12/fs/nfsd/nfsxdr.c linux-4.1.12-vs2.3.8.3/fs/nfsd/nfsxdr.c
---- linux-4.1.12/fs/nfsd/nfsxdr.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/nfsd/nfsxdr.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/nfsd/nfsxdr.c linux-4.1.18-vs2.3.8.4/fs/nfsd/nfsxdr.c
+--- linux-4.1.18/fs/nfsd/nfsxdr.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/nfsd/nfsxdr.c 2015-07-06 20:43:43.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/dlmglue.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/dlmglue.c
---- linux-4.1.12/fs/ocfs2/dlmglue.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/dlmglue.c 2015-10-29 09:25:27.000000000 +0000
-@@ -2077,6 +2077,7 @@ static void __ocfs2_stuff_meta_lvb(struc
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/dlmglue.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/dlmglue.c
+--- linux-4.1.18/fs/ocfs2/dlmglue.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/dlmglue.c 2016-02-19 03:14:23.000000000 +0000
+@@ -2083,6 +2083,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));
lvb->lvb_igid = cpu_to_be32(i_gid_read(inode));
lvb->lvb_imode = cpu_to_be16(inode->i_mode);
lvb->lvb_inlink = cpu_to_be16(inode->i_nlink);
lvb->lvb_iatime_packed =
-@@ -2127,6 +2128,7 @@ static void ocfs2_refresh_inode_from_lvb
+@@ -2133,6 +2134,7 @@ static void ocfs2_refresh_inode_from_lvb
i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid));
i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
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.1.12/fs/ocfs2/dlmglue.h linux-4.1.12-vs2.3.8.3/fs/ocfs2/dlmglue.h
---- linux-4.1.12/fs/ocfs2/dlmglue.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/dlmglue.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/dlmglue.h linux-4.1.18-vs2.3.8.4/fs/ocfs2/dlmglue.h
+--- linux-4.1.18/fs/ocfs2/dlmglue.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/dlmglue.h 2015-07-06 20:43:43.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/file.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/file.c
---- linux-4.1.12/fs/ocfs2/file.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/file.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/file.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/file.c
+--- linux-4.1.18/fs/ocfs2/file.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/file.c 2015-07-06 20:43:43.000000000 +0000
@@ -1146,7 +1146,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/inode.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/inode.c
---- linux-4.1.12/fs/ocfs2/inode.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/inode.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/inode.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/inode.c
+--- linux-4.1.18/fs/ocfs2/inode.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/inode.c 2015-07-06 20:43:43.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/inode.h linux-4.1.12-vs2.3.8.3/fs/ocfs2/inode.h
---- linux-4.1.12/fs/ocfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/inode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/inode.h linux-4.1.18-vs2.3.8.4/fs/ocfs2/inode.h
+--- linux-4.1.18/fs/ocfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/inode.h 2015-07-06 20:43:43.000000000 +0000
@@ -161,6 +161,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/ioctl.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/ioctl.c
---- linux-4.1.12/fs/ocfs2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/ioctl.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/ioctl.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/ioctl.c
+--- linux-4.1.18/fs/ocfs2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/ioctl.c 2015-07-06 20:43:43.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/namei.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/namei.c
---- linux-4.1.12/fs/ocfs2/namei.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/namei.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/namei.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/namei.c
+--- linux-4.1.18/fs/ocfs2/namei.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/namei.c 2016-02-19 03:14:23.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#include <cluster/masklog.h>
-@@ -528,6 +529,7 @@ static int __ocfs2_mknod_locked(struct i
+@@ -530,6 +531,7 @@ static int __ocfs2_mknod_locked(struct i
struct ocfs2_extent_list *fel;
u16 feat;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
*new_fe_bh = NULL;
-@@ -565,8 +567,13 @@ static int __ocfs2_mknod_locked(struct i
+@@ -567,8 +569,13 @@ static int __ocfs2_mknod_locked(struct i
fe->i_suballoc_loc = cpu_to_le64(suballoc_loc);
fe->i_suballoc_bit = cpu_to_le16(suballoc_bit);
fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot);
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.1.12/fs/ocfs2/ocfs2.h linux-4.1.12-vs2.3.8.3/fs/ocfs2/ocfs2.h
---- linux-4.1.12/fs/ocfs2/ocfs2.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/ocfs2.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/ocfs2.h linux-4.1.18-vs2.3.8.4/fs/ocfs2/ocfs2.h
+--- linux-4.1.18/fs/ocfs2/ocfs2.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/ocfs2.h 2015-07-06 20:43:43.000000000 +0000
@@ -286,6 +286,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-4.1.12/fs/ocfs2/ocfs2_fs.h linux-4.1.12-vs2.3.8.3/fs/ocfs2/ocfs2_fs.h
---- linux-4.1.12/fs/ocfs2/ocfs2_fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/ocfs2_fs.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/ocfs2_fs.h linux-4.1.18-vs2.3.8.4/fs/ocfs2/ocfs2_fs.h
+--- linux-4.1.18/fs/ocfs2/ocfs2_fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/ocfs2_fs.h 2015-07-06 20:43:43.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 */
#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.1.12/fs/ocfs2/super.c linux-4.1.12-vs2.3.8.3/fs/ocfs2/super.c
---- linux-4.1.12/fs/ocfs2/super.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/ocfs2/super.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/ocfs2/super.c linux-4.1.18-vs2.3.8.4/fs/ocfs2/super.c
+--- linux-4.1.18/fs/ocfs2/super.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/ocfs2/super.c 2015-10-29 09:25:27.000000000 +0000
@@ -192,6 +192,7 @@ enum {
Opt_resv_level,
Opt_dir_resv_level,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.1.12/fs/open.c linux-4.1.12-vs2.3.8.3/fs/open.c
---- linux-4.1.12/fs/open.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/open.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/open.c linux-4.1.18-vs2.3.8.4/fs/open.c
+--- linux-4.1.18/fs/open.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/open.c 2015-10-29 09:25:27.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-4.1.12/fs/proc/array.c linux-4.1.12-vs2.3.8.3/fs/proc/array.c
---- linux-4.1.12/fs/proc/array.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/array.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/array.c linux-4.1.18-vs2.3.8.4/fs/proc/array.c
+--- linux-4.1.18/fs/proc/array.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/array.c 2016-02-19 03:14:23.000000000 +0000
@@ -83,6 +83,8 @@
#include <linux/tracehook.h>
#include <linux/string_helpers.h>
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.1.12/fs/proc/base.c linux-4.1.12-vs2.3.8.3/fs/proc/base.c
---- linux-4.1.12/fs/proc/base.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/base.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/base.c linux-4.1.18-vs2.3.8.4/fs/proc/base.c
+--- linux-4.1.18/fs/proc/base.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/base.c 2016-02-19 03:14:23.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
#ifdef CONFIG_HARDWALL
#include <asm/hardwall.h>
#endif
-@@ -893,11 +895,15 @@ static ssize_t oom_adj_write(struct file
+@@ -890,11 +892,15 @@ static ssize_t oom_adj_write(struct file
oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
if (oom_adj < task->signal->oom_score_adj &&
/*
* /proc/pid/oom_adj is provided for legacy purposes, ask users to use
* /proc/pid/oom_score_adj instead.
-@@ -1485,6 +1491,8 @@ struct inode *proc_pid_make_inode(struct
+@@ -1482,6 +1488,8 @@ struct inode *proc_pid_make_inode(struct
inode->i_gid = cred->egid;
rcu_read_unlock();
}
security_task_to_inode(task, inode);
out:
-@@ -1530,6 +1538,8 @@ int pid_getattr(struct vfsmount *mnt, st
+@@ -1527,6 +1535,8 @@ int pid_getattr(struct vfsmount *mnt, st
/* dentry stuff */
/*
* Exceptional case: normally we are not allowed to unhash a busy
* directory. In this case, however, we can do it - no aliasing problems
-@@ -1558,6 +1568,19 @@ int pid_revalidate(struct dentry *dentry
+@@ -1555,6 +1565,19 @@ int pid_revalidate(struct dentry *dentry
task = get_proc_task(inode);
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
task_dumpable(task)) {
rcu_read_lock();
-@@ -2095,6 +2118,13 @@ static struct dentry *proc_pident_lookup
+@@ -2092,6 +2115,13 @@ static struct dentry *proc_pident_lookup
if (!task)
goto out_no_task;
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc/<tgid>/ without very good reasons.
-@@ -2546,6 +2576,11 @@ static int proc_pid_personality(struct s
+@@ -2543,6 +2573,11 @@ static int proc_pid_personality(struct s
static const struct file_operations proc_task_operations;
static const struct inode_operations proc_task_inode_operations;
static const struct pid_entry tgid_base_stuff[] = {
DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations),
DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations),
-@@ -2612,6 +2647,8 @@ static const struct pid_entry tgid_base_
+@@ -2609,6 +2644,8 @@ static const struct pid_entry tgid_base_
#ifdef CONFIG_CGROUPS
ONE("cgroup", S_IRUGO, proc_cgroup_show),
#endif
ONE("oom_score", S_IRUGO, proc_oom_score),
REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations),
REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
-@@ -2826,7 +2863,7 @@ retry:
+@@ -2823,7 +2860,7 @@ retry:
iter.task = NULL;
pid = find_ge_pid(iter.tgid, ns);
if (pid) {
iter.task = pid_task(pid, PIDTYPE_PID);
/* What we to know is if the pid we have find is the
* pid of a thread_group_leader. Testing for task
-@@ -2884,8 +2921,10 @@ int proc_pid_readdir(struct file *file,
+@@ -2881,8 +2918,10 @@ int proc_pid_readdir(struct file *file,
if (!has_pid_permissions(ns, iter.task, 2))
continue;
if (!proc_fill_cache(file, ctx, name, len,
proc_pid_instantiate, iter.task, NULL)) {
put_task_struct(iter.task);
-@@ -2982,6 +3021,7 @@ static const struct pid_entry tid_base_s
+@@ -2979,6 +3018,7 @@ static const struct pid_entry tid_base_s
REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations),
REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations),
#endif
};
static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx)
-@@ -3048,6 +3088,8 @@ static struct dentry *proc_task_lookup(s
+@@ -3045,6 +3085,8 @@ static struct dentry *proc_task_lookup(s
tid = name_to_int(&dentry->d_name);
if (tid == ~0U)
goto out;
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.1.12/fs/proc/generic.c linux-4.1.12-vs2.3.8.3/fs/proc/generic.c
---- linux-4.1.12/fs/proc/generic.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/generic.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/generic.c linux-4.1.18-vs2.3.8.4/fs/proc/generic.c
+--- linux-4.1.18/fs/proc/generic.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/generic.c 2015-07-24 14:11:50.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.1.12/fs/proc/inode.c linux-4.1.12-vs2.3.8.3/fs/proc/inode.c
---- linux-4.1.12/fs/proc/inode.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/inode.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/inode.c linux-4.1.18-vs2.3.8.4/fs/proc/inode.c
+--- linux-4.1.18/fs/proc/inode.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/inode.c 2015-07-24 14:11:50.000000000 +0000
@@ -432,6 +432,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-4.1.12/fs/proc/internal.h linux-4.1.12-vs2.3.8.3/fs/proc/internal.h
---- linux-4.1.12/fs/proc/internal.h 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/internal.h 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/internal.h linux-4.1.18-vs2.3.8.4/fs/proc/internal.h
+--- linux-4.1.18/fs/proc/internal.h 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/internal.h 2015-07-24 14:11:50.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
/*
* base.c
-diff -NurpP --minimal linux-4.1.12/fs/proc/loadavg.c linux-4.1.12-vs2.3.8.3/fs/proc/loadavg.c
---- linux-4.1.12/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/loadavg.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/loadavg.c linux-4.1.18-vs2.3.8.4/fs/proc/loadavg.c
+--- linux-4.1.18/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/loadavg.c 2015-07-06 20:43:43.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-4.1.12/fs/proc/meminfo.c linux-4.1.12-vs2.3.8.3/fs/proc/meminfo.c
---- linux-4.1.12/fs/proc/meminfo.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/meminfo.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/meminfo.c linux-4.1.18-vs2.3.8.4/fs/proc/meminfo.c
+--- linux-4.1.18/fs/proc/meminfo.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/meminfo.c 2015-07-06 20:43:43.000000000 +0000
@@ -44,7 +44,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-4.1.12/fs/proc/root.c linux-4.1.12-vs2.3.8.3/fs/proc/root.c
---- linux-4.1.12/fs/proc/root.c 2015-10-29 09:20:35.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/root.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/root.c linux-4.1.18-vs2.3.8.4/fs/proc/root.c
+--- linux-4.1.18/fs/proc/root.c 2016-02-18 18:01:56.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/root.c 2015-07-24 14:11:50.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.1.12/fs/proc/self.c linux-4.1.12-vs2.3.8.3/fs/proc/self.c
---- linux-4.1.12/fs/proc/self.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/self.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/self.c linux-4.1.18-vs2.3.8.4/fs/proc/self.c
+--- linux-4.1.18/fs/proc/self.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/self.c 2015-07-06 20:43:43.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-4.1.12/fs/proc/stat.c linux-4.1.12-vs2.3.8.3/fs/proc/stat.c
---- linux-4.1.12/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/stat.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/stat.c linux-4.1.18-vs2.3.8.4/fs/proc/stat.c
+--- linux-4.1.18/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/stat.c 2015-07-06 20:43:43.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
/* 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.1.12/fs/proc/uptime.c linux-4.1.12-vs2.3.8.3/fs/proc/uptime.c
---- linux-4.1.12/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc/uptime.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc/uptime.c linux-4.1.18-vs2.3.8.4/fs/proc/uptime.c
+--- linux-4.1.18/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc/uptime.c 2015-07-06 20:43:43.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
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.1.12/fs/proc_namespace.c linux-4.1.12-vs2.3.8.3/fs/proc_namespace.c
---- linux-4.1.12/fs/proc_namespace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/proc_namespace.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/proc_namespace.c linux-4.1.18-vs2.3.8.4/fs/proc_namespace.c
+--- linux-4.1.18/fs/proc_namespace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/proc_namespace.c 2015-07-06 20:43:43.000000000 +0000
@@ -45,6 +45,8 @@ static int show_sb_opts(struct seq_file
{ MS_DIRSYNC, ",dirsync" },
{ MS_MANDLOCK, ",mand" },
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-4.1.12/fs/quota/dquot.c linux-4.1.12-vs2.3.8.3/fs/quota/dquot.c
---- linux-4.1.12/fs/quota/dquot.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/quota/dquot.c 2015-07-30 16:55:28.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/quota/dquot.c linux-4.1.18-vs2.3.8.4/fs/quota/dquot.c
+--- linux-4.1.18/fs/quota/dquot.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/quota/dquot.c 2015-07-30 16:55:28.000000000 +0000
@@ -1625,6 +1625,9 @@ int __dquot_alloc_space(struct inode *in
int reserve = flags & DQUOT_SPACE_RESERVE;
struct dquot **dquots;
if (!dquot_active(inode))
return;
-diff -NurpP --minimal linux-4.1.12/fs/quota/quota.c linux-4.1.12-vs2.3.8.3/fs/quota/quota.c
---- linux-4.1.12/fs/quota/quota.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/quota/quota.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/quota/quota.c linux-4.1.18-vs2.3.8.4/fs/quota/quota.c
+--- linux-4.1.18/fs/quota/quota.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/quota/quota.c 2015-07-06 20:43:43.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-4.1.12/fs/stat.c linux-4.1.12-vs2.3.8.3/fs/stat.c
---- linux-4.1.12/fs/stat.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/stat.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/stat.c linux-4.1.18-vs2.3.8.4/fs/stat.c
+--- linux-4.1.18/fs/stat.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/stat.c 2015-07-06 20:43:43.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-4.1.12/fs/statfs.c linux-4.1.12-vs2.3.8.3/fs/statfs.c
---- linux-4.1.12/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/statfs.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/statfs.c linux-4.1.18-vs2.3.8.4/fs/statfs.c
+--- linux-4.1.18/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/statfs.c 2015-07-06 20:43:43.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-4.1.12/fs/super.c linux-4.1.12-vs2.3.8.3/fs/super.c
---- linux-4.1.12/fs/super.c 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/super.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/super.c linux-4.1.18-vs2.3.8.4/fs/super.c
+--- linux-4.1.18/fs/super.c 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/super.c 2015-07-06 20:43:43.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-4.1.12/fs/utimes.c linux-4.1.12-vs2.3.8.3/fs/utimes.c
---- linux-4.1.12/fs/utimes.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/utimes.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/utimes.c linux-4.1.18-vs2.3.8.4/fs/utimes.c
+--- linux-4.1.18/fs/utimes.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/utimes.c 2015-07-06 20:43:43.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-4.1.12/fs/xattr.c linux-4.1.12-vs2.3.8.3/fs/xattr.c
---- linux-4.1.12/fs/xattr.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/fs/xattr.c 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/fs/xattr.c linux-4.1.18-vs2.3.8.4/fs/xattr.c
+--- linux-4.1.18/fs/xattr.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/fs/xattr.c 2015-07-06 20:43:43.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-4.1.12/include/linux/capability.h linux-4.1.12-vs2.3.8.3/include/linux/capability.h
---- linux-4.1.12/include/linux/capability.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/capability.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/capability.h linux-4.1.18-vs2.3.8.4/include/linux/capability.h
+--- linux-4.1.18/include/linux/capability.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/capability.h 2015-07-06 20:43:43.000000000 +0000
@@ -79,7 +79,8 @@ extern const kernel_cap_t __cap_init_eff
#else /* HAND-CODED capability initializers */
# 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.1.12/include/linux/cred.h linux-4.1.12-vs2.3.8.3/include/linux/cred.h
---- linux-4.1.12/include/linux/cred.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/cred.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/cred.h linux-4.1.18-vs2.3.8.4/include/linux/cred.h
+--- linux-4.1.18/include/linux/cred.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/cred.h 2015-07-06 20:43:43.000000000 +0000
@@ -159,6 +159,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 *);
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.1.12/include/linux/devpts_fs.h linux-4.1.12-vs2.3.8.3/include/linux/devpts_fs.h
---- linux-4.1.12/include/linux/devpts_fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/devpts_fs.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/devpts_fs.h linux-4.1.18-vs2.3.8.4/include/linux/devpts_fs.h
+--- linux-4.1.18/include/linux/devpts_fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/devpts_fs.h 2015-07-06 20:43:43.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/fs.h linux-4.1.12-vs2.3.8.3/include/linux/fs.h
---- linux-4.1.12/include/linux/fs.h 2015-10-29 09:20:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/fs.h 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/fs.h linux-4.1.18-vs2.3.8.4/include/linux/fs.h
+--- linux-4.1.18/include/linux/fs.h 2016-02-18 18:01:57.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/fs.h 2015-10-29 09:25:27.000000000 +0000
@@ -224,6 +224,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
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.1.12/include/linux/init_task.h linux-4.1.12-vs2.3.8.3/include/linux/init_task.h
---- linux-4.1.12/include/linux/init_task.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/init_task.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/init_task.h linux-4.1.18-vs2.3.8.4/include/linux/init_task.h
+--- linux-4.1.18/include/linux/init_task.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/init_task.h 2015-07-06 20:43:43.000000000 +0000
@@ -258,6 +258,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
}
-diff -NurpP --minimal linux-4.1.12/include/linux/ipc.h linux-4.1.12-vs2.3.8.3/include/linux/ipc.h
---- linux-4.1.12/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/ipc.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/ipc.h linux-4.1.18-vs2.3.8.4/include/linux/ipc.h
+--- linux-4.1.18/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/ipc.h 2015-07-06 20:43:43.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-4.1.12/include/linux/memcontrol.h linux-4.1.12-vs2.3.8.3/include/linux/memcontrol.h
---- linux-4.1.12/include/linux/memcontrol.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/memcontrol.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/memcontrol.h linux-4.1.18-vs2.3.8.4/include/linux/memcontrol.h
+--- linux-4.1.18/include/linux/memcontrol.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/memcontrol.h 2015-07-06 20:43:43.000000000 +0000
@@ -66,6 +66,7 @@ enum mem_cgroup_events_index {
MEMCG_NR_EVENTS,
};
#ifdef CONFIG_MEMCG
void mem_cgroup_events(struct mem_cgroup *memcg,
enum mem_cgroup_events_index idx,
-diff -NurpP --minimal linux-4.1.12/include/linux/mount.h linux-4.1.12-vs2.3.8.3/include/linux/mount.h
---- linux-4.1.12/include/linux/mount.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/mount.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/mount.h linux-4.1.18-vs2.3.8.4/include/linux/mount.h
+--- linux-4.1.18/include/linux/mount.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/mount.h 2015-07-06 20:43:43.000000000 +0000
@@ -63,6 +63,9 @@ struct mnt_namespace;
#define MNT_MARKED 0x4000000
#define MNT_UMOUNT 0x8000000
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-4.1.12/include/linux/net.h linux-4.1.12-vs2.3.8.3/include/linux/net.h
---- linux-4.1.12/include/linux/net.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/net.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/net.h linux-4.1.18-vs2.3.8.4/include/linux/net.h
+--- linux-4.1.18/include/linux/net.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/net.h 2015-07-06 20:43:43.000000000 +0000
@@ -39,6 +39,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.1.12/include/linux/netdevice.h linux-4.1.12-vs2.3.8.3/include/linux/netdevice.h
---- linux-4.1.12/include/linux/netdevice.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/netdevice.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/netdevice.h linux-4.1.18-vs2.3.8.4/include/linux/netdevice.h
+--- linux-4.1.18/include/linux/netdevice.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/netdevice.h 2015-07-06 20:43:43.000000000 +0000
@@ -2200,6 +2200,7 @@ static inline int dev_recursion_level(vo
struct net_device *dev_get_by_index(struct net *net, int ifindex);
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.1.12/include/linux/nsproxy.h linux-4.1.12-vs2.3.8.3/include/linux/nsproxy.h
---- linux-4.1.12/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/nsproxy.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/nsproxy.h linux-4.1.18-vs2.3.8.4/include/linux/nsproxy.h
+--- linux-4.1.18/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/nsproxy.h 2015-07-06 20:43:43.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/pid.h linux-4.1.12-vs2.3.8.3/include/linux/pid.h
---- linux-4.1.12/include/linux/pid.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/pid.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/pid.h linux-4.1.18-vs2.3.8.4/include/linux/pid.h
+--- linux-4.1.18/include/linux/pid.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/pid.h 2015-07-06 20:43:43.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.1.12/include/linux/quotaops.h linux-4.1.12-vs2.3.8.3/include/linux/quotaops.h
---- linux-4.1.12/include/linux/quotaops.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/quotaops.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/quotaops.h linux-4.1.18-vs2.3.8.4/include/linux/quotaops.h
+--- linux-4.1.18/include/linux/quotaops.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/quotaops.h 2015-07-06 20:43:43.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-4.1.12/include/linux/sched.h linux-4.1.12-vs2.3.8.3/include/linux/sched.h
---- linux-4.1.12/include/linux/sched.h 2015-10-29 09:20:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/sched.h 2015-10-29 09:25:27.000000000 +0000
-@@ -1501,6 +1501,14 @@ struct task_struct {
+diff -NurpP --minimal linux-4.1.18/include/linux/sched.h linux-4.1.18-vs2.3.8.4/include/linux/sched.h
+--- linux-4.1.18/include/linux/sched.h 2016-02-18 18:01:57.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/sched.h 2016-02-19 03:14:23.000000000 +0000
+@@ -1502,6 +1502,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1807,6 +1815,11 @@ struct pid_namespace;
+@@ -1808,6 +1816,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1820,7 +1833,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1821,7 +1834,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
}
-@@ -1833,7 +1847,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1834,7 +1848,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
}
-diff -NurpP --minimal linux-4.1.12/include/linux/shmem_fs.h linux-4.1.12-vs2.3.8.3/include/linux/shmem_fs.h
---- linux-4.1.12/include/linux/shmem_fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/shmem_fs.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/shmem_fs.h linux-4.1.18-vs2.3.8.4/include/linux/shmem_fs.h
+--- linux-4.1.18/include/linux/shmem_fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/shmem_fs.h 2015-07-06 20:43:43.000000000 +0000
@@ -10,6 +10,9 @@
/* inode in-kernel data */
struct shmem_inode_info {
spinlock_t lock;
unsigned int seals; /* shmem seals */
-diff -NurpP --minimal linux-4.1.12/include/linux/stat.h linux-4.1.12-vs2.3.8.3/include/linux/stat.h
---- linux-4.1.12/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/stat.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/stat.h linux-4.1.18-vs2.3.8.4/include/linux/stat.h
+--- linux-4.1.18/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/stat.h 2015-07-06 20:43:43.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-4.1.12/include/linux/sunrpc/auth.h linux-4.1.12-vs2.3.8.3/include/linux/sunrpc/auth.h
---- linux-4.1.12/include/linux/sunrpc/auth.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/sunrpc/auth.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/sunrpc/auth.h linux-4.1.18-vs2.3.8.4/include/linux/sunrpc/auth.h
+--- linux-4.1.18/include/linux/sunrpc/auth.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/sunrpc/auth.h 2015-07-06 20:43:43.000000000 +0000
@@ -36,6 +36,7 @@ enum {
struct auth_cred {
kuid_t uid;
struct group_info *group_info;
const char *principal;
unsigned long ac_flags;
-diff -NurpP --minimal linux-4.1.12/include/linux/sunrpc/clnt.h linux-4.1.12-vs2.3.8.3/include/linux/sunrpc/clnt.h
---- linux-4.1.12/include/linux/sunrpc/clnt.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/sunrpc/clnt.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/sunrpc/clnt.h linux-4.1.18-vs2.3.8.4/include/linux/sunrpc/clnt.h
+--- linux-4.1.18/include/linux/sunrpc/clnt.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/sunrpc/clnt.h 2015-07-06 20:43:43.000000000 +0000
@@ -51,7 +51,8 @@ struct rpc_clnt {
cl_discrtry : 1,/* disconnect before retry */
cl_noretranstimeo: 1,/* No retransmit timeouts */
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-4.1.12/include/linux/types.h linux-4.1.12-vs2.3.8.3/include/linux/types.h
---- linux-4.1.12/include/linux/types.h 2015-10-29 09:20:36.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/types.h 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/types.h linux-4.1.18-vs2.3.8.4/include/linux/types.h
+--- linux-4.1.18/include/linux/types.h 2016-02-18 18:01:57.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/types.h 2016-02-19 03:14:23.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-4.1.12/include/linux/uidgid.h linux-4.1.12-vs2.3.8.3/include/linux/uidgid.h
---- linux-4.1.12/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/uidgid.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/uidgid.h linux-4.1.18-vs2.3.8.4/include/linux/uidgid.h
+--- linux-4.1.18/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/uidgid.h 2015-07-06 20:43:43.000000000 +0000
@@ -21,13 +21,17 @@ typedef struct {
uid_t val;
} kuid_t;
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.1.12/include/linux/vroot.h linux-4.1.12-vs2.3.8.3/include/linux/vroot.h
---- linux-4.1.12/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vroot.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vroot.h linux-4.1.18-vs2.3.8.4/include/linux/vroot.h
+--- linux-4.1.18/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vroot.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
+ * include/linux/vroot.h
+ *
-+ * written by Herbert Pötzl, 9/11/2002
-+ * ported to 2.6 by Herbert Pötzl, 30/12/2004
++ * written by Herbert P?tzl, 9/11/2002
++ * ported to 2.6 by Herbert P?tzl, 30/12/2004
+ *
-+ * Copyright (C) 2002-2007 by Herbert Pötzl.
++ * Copyright (C) 2002-2007 by Herbert P?tzl.
+ * Redistribution of this file is permitted under the
+ * GNU General Public License.
+ */
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_base.h linux-4.1.12-vs2.3.8.3/include/linux/vs_base.h
---- linux-4.1.12/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_base.h 2015-10-29 10:24:21.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_base.h linux-4.1.18-vs2.3.8.4/include/linux/vs_base.h
+--- linux-4.1.18/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_base.h 2015-10-29 10:24:21.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_context.h linux-4.1.12-vs2.3.8.3/include/linux/vs_context.h
---- linux-4.1.12/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_context.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_context.h linux-4.1.18-vs2.3.8.4/include/linux/vs_context.h
+--- linux-4.1.18/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_context.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_cowbl.h linux-4.1.12-vs2.3.8.3/include/linux/vs_cowbl.h
---- linux-4.1.12/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_cowbl.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_cowbl.h linux-4.1.18-vs2.3.8.4/include/linux/vs_cowbl.h
+--- linux-4.1.18/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_cowbl.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_cvirt.h linux-4.1.12-vs2.3.8.3/include/linux/vs_cvirt.h
---- linux-4.1.12/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_cvirt.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_cvirt.h linux-4.1.18-vs2.3.8.4/include/linux/vs_cvirt.h
+--- linux-4.1.18/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_cvirt.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_device.h linux-4.1.12-vs2.3.8.3/include/linux/vs_device.h
---- linux-4.1.12/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_device.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_device.h linux-4.1.18-vs2.3.8.4/include/linux/vs_device.h
+--- linux-4.1.18/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_device.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_dlimit.h linux-4.1.12-vs2.3.8.3/include/linux/vs_dlimit.h
---- linux-4.1.12/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_dlimit.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_dlimit.h linux-4.1.18-vs2.3.8.4/include/linux/vs_dlimit.h
+--- linux-4.1.18/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_dlimit.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_inet.h linux-4.1.12-vs2.3.8.3/include/linux/vs_inet.h
---- linux-4.1.12/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_inet.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_inet.h linux-4.1.18-vs2.3.8.4/include/linux/vs_inet.h
+--- linux-4.1.18/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_inet.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_inet6.h linux-4.1.12-vs2.3.8.3/include/linux/vs_inet6.h
---- linux-4.1.12/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_inet6.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_inet6.h linux-4.1.18-vs2.3.8.4/include/linux/vs_inet6.h
+--- linux-4.1.18/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_inet6.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_limit.h linux-4.1.12-vs2.3.8.3/include/linux/vs_limit.h
---- linux-4.1.12/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_limit.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_limit.h linux-4.1.18-vs2.3.8.4/include/linux/vs_limit.h
+--- linux-4.1.18/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_limit.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_network.h linux-4.1.12-vs2.3.8.3/include/linux/vs_network.h
---- linux-4.1.12/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_network.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_network.h linux-4.1.18-vs2.3.8.4/include/linux/vs_network.h
+--- linux-4.1.18/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_network.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_pid.h linux-4.1.12-vs2.3.8.3/include/linux/vs_pid.h
---- linux-4.1.12/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_pid.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_pid.h linux-4.1.18-vs2.3.8.4/include/linux/vs_pid.h
+--- linux-4.1.18/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_pid.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_sched.h linux-4.1.12-vs2.3.8.3/include/linux/vs_sched.h
---- linux-4.1.12/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_sched.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_sched.h linux-4.1.18-vs2.3.8.4/include/linux/vs_sched.h
+--- linux-4.1.18/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_sched.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_socket.h linux-4.1.12-vs2.3.8.3/include/linux/vs_socket.h
---- linux-4.1.12/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_socket.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_socket.h linux-4.1.18-vs2.3.8.4/include/linux/vs_socket.h
+--- linux-4.1.18/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_socket.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_tag.h linux-4.1.12-vs2.3.8.3/include/linux/vs_tag.h
---- linux-4.1.12/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_tag.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_tag.h linux-4.1.18-vs2.3.8.4/include/linux/vs_tag.h
+--- linux-4.1.18/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_tag.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vs_time.h linux-4.1.12-vs2.3.8.3/include/linux/vs_time.h
---- linux-4.1.12/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vs_time.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vs_time.h linux-4.1.18-vs2.3.8.4/include/linux/vs_time.h
+--- linux-4.1.18/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vs_time.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/base.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/base.h
---- linux-4.1.12/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/base.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/base.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/base.h
+--- linux-4.1.18/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/base.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cacct.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct.h
---- linux-4.1.12/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cacct.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct.h
+--- linux-4.1.18/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cacct_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_cmd.h
---- linux-4.1.12/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cacct_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_cmd.h
+--- linux-4.1.18/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cacct_def.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_def.h
---- linux-4.1.12/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_def.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cacct_def.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_def.h
+--- linux-4.1.18/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_def.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cacct_int.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_int.h
---- linux-4.1.12/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cacct_int.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cacct_int.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_int.h
+--- linux-4.1.18/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cacct_int.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/check.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/check.h
---- linux-4.1.12/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/check.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/check.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/check.h
+--- linux-4.1.18/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/check.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/context.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/context.h
---- linux-4.1.12/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/context.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/context.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/context.h
+--- linux-4.1.18/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/context.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/context_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/context_cmd.h
---- linux-4.1.12/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/context_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/context_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/context_cmd.h
+--- linux-4.1.18/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/context_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cvirt.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt.h
---- linux-4.1.12/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cvirt.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt.h
+--- linux-4.1.18/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cvirt_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt_cmd.h
---- linux-4.1.12/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cvirt_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt_cmd.h
+--- linux-4.1.18/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/cvirt_def.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt_def.h
---- linux-4.1.12/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/cvirt_def.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/cvirt_def.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt_def.h
+--- linux-4.1.18/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/cvirt_def.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/debug.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/debug.h
---- linux-4.1.12/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/debug.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/debug.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/debug.h
+--- linux-4.1.18/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/debug.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/debug_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/debug_cmd.h
---- linux-4.1.12/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/debug_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/debug_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/debug_cmd.h
+--- linux-4.1.18/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/debug_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/device.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/device.h
---- linux-4.1.12/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/device.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/device.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/device.h
+--- linux-4.1.18/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/device.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/device_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/device_cmd.h
---- linux-4.1.12/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/device_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/device_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/device_cmd.h
+--- linux-4.1.18/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/device_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/device_def.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/device_def.h
---- linux-4.1.12/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/device_def.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/device_def.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/device_def.h
+--- linux-4.1.18/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/device_def.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/dlimit.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/dlimit.h
---- linux-4.1.12/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/dlimit.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/dlimit.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/dlimit.h
+--- linux-4.1.18/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/dlimit.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/dlimit_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/dlimit_cmd.h
---- linux-4.1.12/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/dlimit_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/dlimit_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/dlimit_cmd.h
+--- linux-4.1.18/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/dlimit_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/global.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/global.h
---- linux-4.1.12/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/global.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/global.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/global.h
+--- linux-4.1.18/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/global.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/history.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/history.h
---- linux-4.1.12/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/history.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/history.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/history.h
+--- linux-4.1.18/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/history.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/inode.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/inode.h
---- linux-4.1.12/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/inode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/inode.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/inode.h
+--- linux-4.1.18/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/inode.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/inode_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/inode_cmd.h
---- linux-4.1.12/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/inode_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/inode_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/inode_cmd.h
+--- linux-4.1.18/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/inode_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/limit.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit.h
---- linux-4.1.12/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/limit.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit.h
+--- linux-4.1.18/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,61 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/limit_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_cmd.h
---- linux-4.1.12/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/limit_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_cmd.h
+--- linux-4.1.18/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/limit_def.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_def.h
---- linux-4.1.12/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_def.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/limit_def.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_def.h
+--- linux-4.1.18/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_def.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/limit_int.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_int.h
---- linux-4.1.12/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/limit_int.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/limit_int.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_int.h
+--- linux-4.1.18/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/limit_int.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/monitor.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/monitor.h
---- linux-4.1.12/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/monitor.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/monitor.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/monitor.h
+--- linux-4.1.18/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/monitor.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/network.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/network.h
---- linux-4.1.12/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/network.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/network.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/network.h
+--- linux-4.1.18/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/network.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/network_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/network_cmd.h
---- linux-4.1.12/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/network_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/network_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/network_cmd.h
+--- linux-4.1.18/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/network_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/percpu.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/percpu.h
---- linux-4.1.12/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/percpu.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/percpu.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/percpu.h
+--- linux-4.1.18/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/percpu.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/pid.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/pid.h
---- linux-4.1.12/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/pid.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/pid.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/pid.h
+--- linux-4.1.18/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/pid.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/sched.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched.h
---- linux-4.1.12/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/sched.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched.h
+--- linux-4.1.18/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/sched_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched_cmd.h
---- linux-4.1.12/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/sched_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched_cmd.h
+--- linux-4.1.18/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/sched_def.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched_def.h
---- linux-4.1.12/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/sched_def.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/sched_def.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched_def.h
+--- linux-4.1.18/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/sched_def.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/signal.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/signal.h
---- linux-4.1.12/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/signal.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/signal.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/signal.h
+--- linux-4.1.18/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/signal.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/signal_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/signal_cmd.h
---- linux-4.1.12/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/signal_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/signal_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/signal_cmd.h
+--- linux-4.1.18/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/signal_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/space.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/space.h
---- linux-4.1.12/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/space.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/space.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/space.h
+--- linux-4.1.18/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/space.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/space_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/space_cmd.h
---- linux-4.1.12/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/space_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/space_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/space_cmd.h
+--- linux-4.1.18/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/space_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/switch.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/switch.h
---- linux-4.1.12/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/switch.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/switch.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/switch.h
+--- linux-4.1.18/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/switch.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/tag.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/tag.h
---- linux-4.1.12/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/tag.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/tag.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/tag.h
+--- linux-4.1.18/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/tag.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-4.1.12/include/linux/vserver/tag_cmd.h linux-4.1.12-vs2.3.8.3/include/linux/vserver/tag_cmd.h
---- linux-4.1.12/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/linux/vserver/tag_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/linux/vserver/tag_cmd.h linux-4.1.18-vs2.3.8.4/include/linux/vserver/tag_cmd.h
+--- linux-4.1.18/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/linux/vserver/tag_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/net/addrconf.h linux-4.1.12-vs2.3.8.3/include/net/addrconf.h
---- linux-4.1.12/include/net/addrconf.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/addrconf.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/addrconf.h linux-4.1.18-vs2.3.8.4/include/net/addrconf.h
+--- linux-4.1.18/include/net/addrconf.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/addrconf.h 2015-07-06 20:43:43.000000000 +0000
@@ -82,7 +82,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
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.1.12/include/net/af_unix.h linux-4.1.12-vs2.3.8.3/include/net/af_unix.h
---- linux-4.1.12/include/net/af_unix.h 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/af_unix.h 2015-10-29 10:24:15.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/af_unix.h linux-4.1.18-vs2.3.8.4/include/net/af_unix.h
+--- linux-4.1.18/include/net/af_unix.h 2016-02-18 18:01:57.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/af_unix.h 2016-02-19 03:14:23.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-4.1.12/include/net/inet_timewait_sock.h linux-4.1.12-vs2.3.8.3/include/net/inet_timewait_sock.h
---- linux-4.1.12/include/net/inet_timewait_sock.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/inet_timewait_sock.h 2015-07-06 20:45:00.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/inet_timewait_sock.h linux-4.1.18-vs2.3.8.4/include/net/inet_timewait_sock.h
+--- linux-4.1.18/include/net/inet_timewait_sock.h 2016-02-18 18:01:57.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/inet_timewait_sock.h 2016-02-19 03:14:23.000000000 +0000
@@ -70,6 +70,10 @@ struct inet_timewait_sock {
#define tw_dport __tw_common.skc_dport
#define tw_num __tw_common.skc_num
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-4.1.12/include/net/ip6_route.h linux-4.1.12-vs2.3.8.3/include/net/ip6_route.h
---- linux-4.1.12/include/net/ip6_route.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/ip6_route.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/ip6_route.h linux-4.1.18-vs2.3.8.4/include/net/ip6_route.h
+--- linux-4.1.18/include/net/ip6_route.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/ip6_route.h 2015-07-06 20:43:43.000000000 +0000
@@ -80,7 +80,7 @@ int ip6_del_rt(struct rt6_info *);
int ip6_route_get_saddr(struct net *net, struct rt6_info *rt,
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.1.12/include/net/route.h linux-4.1.12-vs2.3.8.3/include/net/route.h
---- linux-4.1.12/include/net/route.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/route.h 2015-10-29 10:20:13.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/route.h linux-4.1.18-vs2.3.8.4/include/net/route.h
+--- linux-4.1.18/include/net/route.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/route.h 2015-10-29 10:20:13.000000000 +0000
@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-4.1.12/include/net/sock.h linux-4.1.12-vs2.3.8.3/include/net/sock.h
---- linux-4.1.12/include/net/sock.h 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/net/sock.h 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/net/sock.h linux-4.1.18-vs2.3.8.4/include/net/sock.h
+--- linux-4.1.18/include/net/sock.h 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/net/sock.h 2016-02-19 03:14:23.000000000 +0000
@@ -196,6 +196,10 @@ struct sock_common {
struct in6_addr skc_v6_daddr;
struct in6_addr skc_v6_rcv_saddr;
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
-diff -NurpP --minimal linux-4.1.12/include/uapi/Kbuild linux-4.1.12-vs2.3.8.3/include/uapi/Kbuild
---- linux-4.1.12/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/Kbuild 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/Kbuild linux-4.1.18-vs2.3.8.4/include/uapi/Kbuild
+--- linux-4.1.18/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/Kbuild 2015-07-06 20:43:43.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.1.12/include/uapi/linux/capability.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/capability.h
---- linux-4.1.12/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/capability.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/capability.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/capability.h
+--- linux-4.1.18/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/capability.h 2015-07-06 20:43:43.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/fs.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/fs.h
---- linux-4.1.12/include/uapi/linux/fs.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/fs.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/fs.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/fs.h
+--- linux-4.1.18/include/uapi/linux/fs.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/fs.h 2015-07-06 20:43:43.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 */
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/gfs2_ondisk.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/gfs2_ondisk.h
---- linux-4.1.12/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/gfs2_ondisk.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/gfs2_ondisk.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/gfs2_ondisk.h
+--- linux-4.1.18/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/gfs2_ondisk.h 2015-07-06 20:43:43.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
#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.1.12/include/uapi/linux/if_tun.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/if_tun.h
---- linux-4.1.12/include/uapi/linux/if_tun.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/if_tun.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/if_tun.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/if_tun.h
+--- linux-4.1.18/include/uapi/linux/if_tun.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/if_tun.h 2015-07-06 20:43:43.000000000 +0000
@@ -50,6 +50,7 @@
#define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
#define TUNSETVNETLE _IOW('T', 220, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/major.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/major.h
---- linux-4.1.12/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/major.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/major.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/major.h
+--- linux-4.1.18/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/major.h 2015-07-06 20:43:43.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/nfs_mount.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/nfs_mount.h
---- linux-4.1.12/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/nfs_mount.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/nfs_mount.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/nfs_mount.h
+--- linux-4.1.18/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/nfs_mount.h 2015-07-06 20:43:43.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 */
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/reboot.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/reboot.h
---- linux-4.1.12/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/reboot.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/reboot.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/reboot.h
+--- linux-4.1.18/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/reboot.h 2015-07-06 20:43:43.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/linux/sysctl.h linux-4.1.12-vs2.3.8.3/include/uapi/linux/sysctl.h
---- linux-4.1.12/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/linux/sysctl.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/linux/sysctl.h linux-4.1.18-vs2.3.8.4/include/uapi/linux/sysctl.h
+--- linux-4.1.18/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/linux/sysctl.h 2015-07-06 20:43:43.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/Kbuild linux-4.1.12-vs2.3.8.3/include/uapi/vserver/Kbuild
---- linux-4.1.12/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/Kbuild 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/Kbuild linux-4.1.18-vs2.3.8.4/include/uapi/vserver/Kbuild
+--- linux-4.1.18/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/Kbuild 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/cacct_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/cacct_cmd.h
---- linux-4.1.12/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/cacct_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/cacct_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/cacct_cmd.h
+--- linux-4.1.18/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/cacct_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/context.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/context.h
---- linux-4.1.12/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/context.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/context.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/context.h
+--- linux-4.1.18/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/context.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/context_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/context_cmd.h
---- linux-4.1.12/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/context_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/context_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/context_cmd.h
+--- linux-4.1.18/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/context_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/cvirt_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/cvirt_cmd.h
---- linux-4.1.12/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/cvirt_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/cvirt_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/cvirt_cmd.h
+--- linux-4.1.18/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/cvirt_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/debug_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/debug_cmd.h
---- linux-4.1.12/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/debug_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/debug_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/debug_cmd.h
+--- linux-4.1.18/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/debug_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/device.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/device.h
---- linux-4.1.12/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/device.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/device.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/device.h
+--- linux-4.1.18/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/device.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/device_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/device_cmd.h
---- linux-4.1.12/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/device_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/device_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/device_cmd.h
+--- linux-4.1.18/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/device_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/dlimit_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/dlimit_cmd.h
---- linux-4.1.12/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/dlimit_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/dlimit_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/dlimit_cmd.h
+--- linux-4.1.18/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/dlimit_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/inode.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/inode.h
---- linux-4.1.12/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/inode.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/inode.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/inode.h
+--- linux-4.1.18/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/inode.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/inode_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/inode_cmd.h
---- linux-4.1.12/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/inode_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/inode_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/inode_cmd.h
+--- linux-4.1.18/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/inode_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/limit.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/limit.h
---- linux-4.1.12/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/limit.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/limit.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/limit.h
+--- linux-4.1.18/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/limit.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/limit_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/limit_cmd.h
---- linux-4.1.12/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/limit_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/limit_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/limit_cmd.h
+--- linux-4.1.18/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/limit_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/monitor.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/monitor.h
---- linux-4.1.12/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/monitor.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/monitor.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/monitor.h
+--- linux-4.1.18/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/monitor.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/network.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/network.h
---- linux-4.1.12/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/network.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/network.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/network.h
+--- linux-4.1.18/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/network.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/network_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/network_cmd.h
---- linux-4.1.12/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/network_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/network_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/network_cmd.h
+--- linux-4.1.18/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/network_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/sched_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/sched_cmd.h
---- linux-4.1.12/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/sched_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/sched_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/sched_cmd.h
+--- linux-4.1.18/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/sched_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/signal_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/signal_cmd.h
---- linux-4.1.12/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/signal_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/signal_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/signal_cmd.h
+--- linux-4.1.18/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/signal_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/space_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/space_cmd.h
---- linux-4.1.12/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/space_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/space_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/space_cmd.h
+--- linux-4.1.18/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/space_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/switch.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/switch.h
---- linux-4.1.12/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/switch.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/switch.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/switch.h
+--- linux-4.1.18/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/switch.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-4.1.12/include/uapi/vserver/tag_cmd.h linux-4.1.12-vs2.3.8.3/include/uapi/vserver/tag_cmd.h
---- linux-4.1.12/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/include/uapi/vserver/tag_cmd.h 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/include/uapi/vserver/tag_cmd.h linux-4.1.18-vs2.3.8.4/include/uapi/vserver/tag_cmd.h
+--- linux-4.1.18/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/include/uapi/vserver/tag_cmd.h 2015-07-06 20:43:43.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-4.1.12/init/Kconfig linux-4.1.12-vs2.3.8.3/init/Kconfig
---- linux-4.1.12/init/Kconfig 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/init/Kconfig 2015-07-06 20:43:43.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/init/Kconfig linux-4.1.18-vs2.3.8.4/init/Kconfig
+--- linux-4.1.18/init/Kconfig 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/init/Kconfig 2015-07-06 20:43:43.000000000 +0000
@@ -938,6 +938,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
menuconfig CGROUPS
bool "Control Group support"
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.1.12/init/main.c linux-4.1.12-vs2.3.8.3/init/main.c
---- linux-4.1.12/init/main.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/init/main.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/init/main.c linux-4.1.18-vs2.3.8.4/init/main.c
+--- linux-4.1.18/init/main.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/init/main.c 2015-07-24 14:11:50.000000000 +0000
@@ -81,6 +81,7 @@
#include <linux/integrity.h>
#include <linux/proc_ns.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-4.1.12/ipc/mqueue.c linux-4.1.12-vs2.3.8.3/ipc/mqueue.c
---- linux-4.1.12/ipc/mqueue.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/ipc/mqueue.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/ipc/mqueue.c linux-4.1.18-vs2.3.8.4/ipc/mqueue.c
+--- linux-4.1.18/ipc/mqueue.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/ipc/mqueue.c 2015-10-29 09:25:27.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-4.1.12/ipc/msg.c linux-4.1.12-vs2.3.8.3/ipc/msg.c
---- linux-4.1.12/ipc/msg.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/ipc/msg.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/ipc/msg.c linux-4.1.18-vs2.3.8.4/ipc/msg.c
+--- linux-4.1.18/ipc/msg.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/ipc/msg.c 2015-10-29 09:25:27.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-4.1.12/ipc/sem.c linux-4.1.12-vs2.3.8.3/ipc/sem.c
---- linux-4.1.12/ipc/sem.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/ipc/sem.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/ipc/sem.c linux-4.1.18-vs2.3.8.4/ipc/sem.c
+--- linux-4.1.18/ipc/sem.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/ipc/sem.c 2015-10-29 09:25:27.000000000 +0000
@@ -85,6 +85,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-4.1.12/ipc/shm.c linux-4.1.12-vs2.3.8.3/ipc/shm.c
---- linux-4.1.12/ipc/shm.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/ipc/shm.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/ipc/shm.c linux-4.1.18-vs2.3.8.4/ipc/shm.c
+--- linux-4.1.18/ipc/shm.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/ipc/shm.c 2015-10-29 09:25:27.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-4.1.12/kernel/Makefile linux-4.1.12-vs2.3.8.3/kernel/Makefile
---- linux-4.1.12/kernel/Makefile 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/Makefile 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/Makefile linux-4.1.18-vs2.3.8.4/kernel/Makefile
+--- linux-4.1.18/kernel/Makefile 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/Makefile 2015-07-06 20:43:44.000000000 +0000
@@ -29,6 +29,7 @@ obj-y += printk/
obj-y += irq/
obj-y += rcu/
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-4.1.12/kernel/auditsc.c linux-4.1.12-vs2.3.8.3/kernel/auditsc.c
---- linux-4.1.12/kernel/auditsc.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/auditsc.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/auditsc.c linux-4.1.18-vs2.3.8.4/kernel/auditsc.c
+--- linux-4.1.18/kernel/auditsc.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/auditsc.c 2015-07-06 20:43:44.000000000 +0000
@@ -1966,7 +1966,7 @@ static int audit_set_loginuid_perm(kuid_
if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE))
return -EPERM;
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.1.12/kernel/capability.c linux-4.1.12-vs2.3.8.3/kernel/capability.c
---- linux-4.1.12/kernel/capability.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/capability.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/capability.c linux-4.1.18-vs2.3.8.4/kernel/capability.c
+--- linux-4.1.18/kernel/capability.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/capability.c 2015-07-06 20:43:44.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-4.1.12/kernel/compat.c linux-4.1.12-vs2.3.8.3/kernel/compat.c
---- linux-4.1.12/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/compat.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/compat.c linux-4.1.18-vs2.3.8.4/kernel/compat.c
+--- linux-4.1.18/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/compat.c 2015-07-06 20:43:44.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
return 0;
}
-diff -NurpP --minimal linux-4.1.12/kernel/cred.c linux-4.1.12-vs2.3.8.3/kernel/cred.c
---- linux-4.1.12/kernel/cred.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/cred.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/cred.c linux-4.1.18-vs2.3.8.4/kernel/cred.c
+--- linux-4.1.18/kernel/cred.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/cred.c 2015-07-06 20:43:44.000000000 +0000
@@ -59,31 +59,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-4.1.12/kernel/exit.c linux-4.1.12-vs2.3.8.3/kernel/exit.c
---- linux-4.1.12/kernel/exit.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/exit.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/exit.c linux-4.1.18-vs2.3.8.4/kernel/exit.c
+--- linux-4.1.18/kernel/exit.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/exit.c 2016-02-19 03:25:02.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
}
/*
-@@ -761,6 +778,9 @@ void do_exit(long code)
+@@ -562,9 +579,13 @@ static void forget_original_parent(struc
+ return;
+
+ reaper = find_new_reaper(father, reaper);
+- list_for_each_entry(p, &father->children, sibling) {
++ for (p = list_first_entry(&father->children, struct task_struct, sibling);
++ &p->sibling != &father->children; ) {
++ struct task_struct *next, *this_reaper = reaper;
++ if (p == reaper)
++ this_reaper = task_active_pid_ns(reaper)->child_reaper;
+ for_each_thread(p, t) {
+- t->real_parent = reaper;
++ t->real_parent = this_reaper;
+ BUG_ON((!t->ptrace) != (t->parent == father));
+ if (likely(!t->ptrace))
+ t->parent = t->real_parent;
+@@ -576,10 +597,13 @@ static void forget_original_parent(struc
+ * If this is a threaded reparent there is no need to
+ * notify anyone anything has happened.
+ */
+- if (!same_thread_group(reaper, father))
++ if (!same_thread_group(this_reaper, father))
+ reparent_leader(father, p, dead);
++ next = list_next_entry(p, sibling);
++ list_add(&p->sibling, &this_reaper->children);
++ p = next;
+ }
+- list_splice_tail_init(&father->children, &reaper->children);
++ INIT_LIST_HEAD(&father->children);
+ }
+
+ /*
+@@ -761,6 +785,9 @@ void do_exit(long code)
*/
flush_ptrace_hw_breakpoint(tsk);
TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu));
exit_notify(tsk, group_dead);
proc_exit_connector(tsk);
-@@ -818,10 +838,15 @@ void do_exit(long code)
+@@ -818,10 +845,15 @@ void do_exit(long code)
smp_mb();
raw_spin_unlock_wait(&tsk->pi_lock);
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-4.1.12/kernel/fork.c linux-4.1.12-vs2.3.8.3/kernel/fork.c
---- linux-4.1.12/kernel/fork.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/fork.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/fork.c linux-4.1.18-vs2.3.8.4/kernel/fork.c
+--- linux-4.1.18/kernel/fork.c 2016-02-18 18:01:59.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/fork.c 2015-10-29 09:25:27.000000000 +0000
@@ -75,6 +75,9 @@
#include <linux/aio.h>
#include <linux/compiler.h>
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
-diff -NurpP --minimal linux-4.1.12/kernel/kthread.c linux-4.1.12-vs2.3.8.3/kernel/kthread.c
---- linux-4.1.12/kernel/kthread.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/kthread.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/kthread.c linux-4.1.18-vs2.3.8.4/kernel/kthread.c
+--- linux-4.1.18/kernel/kthread.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/kthread.c 2015-07-06 20:43:44.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/freezer.h>
#include <linux/ptrace.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-4.1.12/kernel/nsproxy.c linux-4.1.12-vs2.3.8.3/kernel/nsproxy.c
---- linux-4.1.12/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/nsproxy.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/nsproxy.c linux-4.1.18-vs2.3.8.4/kernel/nsproxy.c
+--- linux-4.1.18/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/nsproxy.c 2015-07-06 20:43:44.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-4.1.12/kernel/pid.c linux-4.1.12-vs2.3.8.3/kernel/pid.c
---- linux-4.1.12/kernel/pid.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/pid.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/pid.c linux-4.1.18-vs2.3.8.4/kernel/pid.c
+--- linux-4.1.18/kernel/pid.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/pid.c 2015-07-06 20:43:44.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/proc_ns.h>
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, task_active_pid_ns(current));
-diff -NurpP --minimal linux-4.1.12/kernel/pid_namespace.c linux-4.1.12-vs2.3.8.3/kernel/pid_namespace.c
---- linux-4.1.12/kernel/pid_namespace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/pid_namespace.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/pid_namespace.c linux-4.1.18-vs2.3.8.4/kernel/pid_namespace.c
+--- linux-4.1.18/kernel/pid_namespace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/pid_namespace.c 2015-07-06 20:43:44.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_ns.h>
#include <linux/reboot.h>
kmem_cache_free(pid_ns_cachep, ns);
out:
return ERR_PTR(err);
-diff -NurpP --minimal linux-4.1.12/kernel/printk/printk.c linux-4.1.12-vs2.3.8.3/kernel/printk/printk.c
---- linux-4.1.12/kernel/printk/printk.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/printk/printk.c 2015-10-29 09:27:04.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/printk/printk.c linux-4.1.18-vs2.3.8.4/kernel/printk/printk.c
+--- linux-4.1.18/kernel/printk/printk.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/printk/printk.c 2016-02-19 03:14:23.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/ctype.h>
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-4.1.12/kernel/ptrace.c linux-4.1.12-vs2.3.8.3/kernel/ptrace.c
---- linux-4.1.12/kernel/ptrace.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/ptrace.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/ptrace.c linux-4.1.18-vs2.3.8.4/kernel/ptrace.c
+--- linux-4.1.18/kernel/ptrace.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/ptrace.c 2015-07-06 20:43:44.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-4.1.12/kernel/reboot.c linux-4.1.12-vs2.3.8.3/kernel/reboot.c
---- linux-4.1.12/kernel/reboot.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/reboot.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/reboot.c linux-4.1.18-vs2.3.8.4/kernel/reboot.c
+--- linux-4.1.18/kernel/reboot.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/reboot.c 2015-07-06 20:43:44.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/syscalls.h>
#include <linux/syscore_ops.h>
mutex_lock(&reboot_mutex);
switch (cmd) {
case LINUX_REBOOT_CMD_RESTART:
-diff -NurpP --minimal linux-4.1.12/kernel/sched/core.c linux-4.1.12-vs2.3.8.3/kernel/sched/core.c
---- linux-4.1.12/kernel/sched/core.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sched/core.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sched/core.c linux-4.1.18-vs2.3.8.4/kernel/sched/core.c
+--- linux-4.1.18/kernel/sched/core.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sched/core.c 2015-10-29 09:25:27.000000000 +0000
@@ -74,6 +74,8 @@
#include <linux/binfmts.h>
#include <linux/context_tracking.h>
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-4.1.12/kernel/sched/cputime.c linux-4.1.12-vs2.3.8.3/kernel/sched/cputime.c
---- linux-4.1.12/kernel/sched/cputime.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sched/cputime.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sched/cputime.c linux-4.1.18-vs2.3.8.4/kernel/sched/cputime.c
+--- linux-4.1.18/kernel/sched/cputime.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sched/cputime.c 2015-07-06 20:43:44.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-4.1.12/kernel/sched/fair.c linux-4.1.12-vs2.3.8.3/kernel/sched/fair.c
---- linux-4.1.12/kernel/sched/fair.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sched/fair.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sched/fair.c linux-4.1.18-vs2.3.8.4/kernel/sched/fair.c
+--- linux-4.1.18/kernel/sched/fair.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sched/fair.c 2015-10-29 09:25:27.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
account_entity_dequeue(cfs_rq, se);
/*
-diff -NurpP --minimal linux-4.1.12/kernel/sched/proc.c linux-4.1.12-vs2.3.8.3/kernel/sched/proc.c
---- linux-4.1.12/kernel/sched/proc.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sched/proc.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sched/proc.c linux-4.1.18-vs2.3.8.4/kernel/sched/proc.c
+--- linux-4.1.18/kernel/sched/proc.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sched/proc.c 2015-07-06 20:43:44.000000000 +0000
@@ -71,9 +71,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem
*/
void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
}
long calc_load_fold_active(struct rq *this_rq)
-diff -NurpP --minimal linux-4.1.12/kernel/signal.c linux-4.1.12-vs2.3.8.3/kernel/signal.c
---- linux-4.1.12/kernel/signal.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/signal.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/signal.c linux-4.1.18-vs2.3.8.4/kernel/signal.c
+--- linux-4.1.18/kernel/signal.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/signal.c 2016-02-19 03:21:28.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/compat.h>
#include <linux/cn_proc.h>
return security_task_kill(t, info, sig, 0);
}
-@@ -1344,7 +1369,7 @@ int kill_pid_info(int sig, struct siginf
+@@ -1344,8 +1369,14 @@ int kill_pid_info(int sig, struct siginf
for (;;) {
rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
- if (p)
-+ if (p && vx_check(vx_task_xid(p), VS_IDENT))
- error = group_send_sig_info(sig, info, p);
+- error = group_send_sig_info(sig, info, p);
++ if (p) {
++ if (vx_check(vx_task_xid(p), VS_IDENT))
++ error = group_send_sig_info(sig, info, p);
++ else {
++ rcu_read_unlock();
++ return -ESRCH;
++ }
++ }
rcu_read_unlock();
if (likely(!p || error != -ESRCH))
-@@ -1390,7 +1415,7 @@ int kill_pid_info_as_cred(int sig, struc
+ return error;
+@@ -1390,7 +1421,7 @@ int kill_pid_info_as_cred(int sig, struc
rcu_read_lock();
p = pid_task(pid, PIDTYPE_PID);
ret = -ESRCH;
goto out_unlock;
}
-@@ -1442,8 +1467,10 @@ static int kill_something_info(int sig,
+@@ -1442,8 +1473,10 @@ static int kill_something_info(int sig,
struct task_struct * p;
for_each_process(p) {
int err = group_send_sig_info(sig, info, p);
++count;
if (err != -EPERM)
-@@ -2296,6 +2323,11 @@ relock:
+@@ -2296,6 +2329,11 @@ relock:
!sig_kernel_only(signr))
continue;
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-4.1.12/kernel/softirq.c linux-4.1.12-vs2.3.8.3/kernel/softirq.c
---- linux-4.1.12/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/softirq.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/softirq.c linux-4.1.18-vs2.3.8.4/kernel/softirq.c
+--- linux-4.1.18/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/softirq.c 2015-07-06 20:43:44.000000000 +0000
@@ -26,6 +26,7 @@
#include <linux/smpboot.h>
#include <linux/tick.h>
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-4.1.12/kernel/sys.c linux-4.1.12-vs2.3.8.3/kernel/sys.c
---- linux-4.1.12/kernel/sys.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sys.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sys.c linux-4.1.18-vs2.3.8.4/kernel/sys.c
+--- linux-4.1.18/kernel/sys.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sys.c 2016-02-19 03:14:23.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/cred.h>
return 0;
return -EPERM;
-diff -NurpP --minimal linux-4.1.12/kernel/sysctl.c linux-4.1.12-vs2.3.8.3/kernel/sysctl.c
---- linux-4.1.12/kernel/sysctl.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sysctl.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sysctl.c linux-4.1.18-vs2.3.8.4/kernel/sysctl.c
+--- linux-4.1.18/kernel/sysctl.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sysctl.c 2015-07-24 14:11:50.000000000 +0000
@@ -85,6 +85,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
#endif /* CONFIG_COMPACTION */
{
.procname = "min_free_kbytes",
-diff -NurpP --minimal linux-4.1.12/kernel/sysctl_binary.c linux-4.1.12-vs2.3.8.3/kernel/sysctl_binary.c
---- linux-4.1.12/kernel/sysctl_binary.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/sysctl_binary.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/sysctl_binary.c linux-4.1.18-vs2.3.8.4/kernel/sysctl_binary.c
+--- linux-4.1.18/kernel/sysctl_binary.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/sysctl_binary.c 2015-07-06 20:43:44.000000000 +0000
@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-4.1.12/kernel/time/posix-timers.c linux-4.1.12-vs2.3.8.3/kernel/time/posix-timers.c
---- linux-4.1.12/kernel/time/posix-timers.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/time/posix-timers.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/time/posix-timers.c linux-4.1.18-vs2.3.8.4/kernel/time/posix-timers.c
+--- linux-4.1.18/kernel/time/posix-timers.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/time/posix-timers.c 2015-07-06 20:43:44.000000000 +0000
@@ -48,6 +48,7 @@
#include <linux/workqueue.h>
#include <linux/export.h>
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-4.1.12/kernel/time/time.c linux-4.1.12-vs2.3.8.3/kernel/time/time.c
---- linux-4.1.12/kernel/time/time.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/time/time.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/time/time.c linux-4.1.18-vs2.3.8.4/kernel/time/time.c
+--- linux-4.1.18/kernel/time/time.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/time/time.c 2015-07-06 20:43:44.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
return 0;
}
-diff -NurpP --minimal linux-4.1.12/kernel/time/timekeeping.c linux-4.1.12-vs2.3.8.3/kernel/time/timekeeping.c
---- linux-4.1.12/kernel/time/timekeeping.c 2015-10-29 09:20:37.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/time/timekeeping.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/time/timekeeping.c linux-4.1.18-vs2.3.8.4/kernel/time/timekeeping.c
+--- linux-4.1.18/kernel/time/timekeeping.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/time/timekeeping.c 2016-02-19 03:14:23.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/stop_machine.h>
#include <linux/pvclock_gtod.h>
#include "tick-internal.h"
#include "ntp_internal.h"
-@@ -878,7 +879,9 @@ void getnstime_raw_and_real(struct times
+@@ -877,7 +878,9 @@ void getnstime_raw_and_real(struct times
} while (read_seqcount_retry(&tk_core.seq, seq));
timespec_add_ns(ts_raw, nsecs_raw);
}
EXPORT_SYMBOL(getnstime_raw_and_real);
-diff -NurpP --minimal linux-4.1.12/kernel/time/timer.c linux-4.1.12-vs2.3.8.3/kernel/time/timer.c
---- linux-4.1.12/kernel/time/timer.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/time/timer.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/time/timer.c linux-4.1.18-vs2.3.8.4/kernel/time/timer.c
+--- linux-4.1.18/kernel/time/timer.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/time/timer.c 2015-07-06 20:43:44.000000000 +0000
@@ -42,6 +42,10 @@
#include <linux/sched/sysctl.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-4.1.12/kernel/user_namespace.c linux-4.1.12-vs2.3.8.3/kernel/user_namespace.c
---- linux-4.1.12/kernel/user_namespace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/user_namespace.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/user_namespace.c linux-4.1.18-vs2.3.8.4/kernel/user_namespace.c
+--- linux-4.1.18/kernel/user_namespace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/user_namespace.c 2015-07-06 20:43:44.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/projid.h>
/**
* make_kprojid - Map a user-namespace projid pair into a kprojid.
* @ns: User namespace that the projid is in
-diff -NurpP --minimal linux-4.1.12/kernel/utsname.c linux-4.1.12-vs2.3.8.3/kernel/utsname.c
---- linux-4.1.12/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/utsname.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/utsname.c linux-4.1.18-vs2.3.8.4/kernel/utsname.c
+--- linux-4.1.18/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/utsname.c 2015-07-06 20:43:44.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/Kconfig linux-4.1.12-vs2.3.8.3/kernel/vserver/Kconfig
---- linux-4.1.12/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/Kconfig 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/Kconfig linux-4.1.18-vs2.3.8.4/kernel/vserver/Kconfig
+--- linux-4.1.18/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/Kconfig 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/Makefile linux-4.1.12-vs2.3.8.3/kernel/vserver/Makefile
---- linux-4.1.12/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/Makefile 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/Makefile linux-4.1.18-vs2.3.8.4/kernel/vserver/Makefile
+--- linux-4.1.18/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/Makefile 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cacct.c linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct.c
---- linux-4.1.12/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cacct.c linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct.c
+--- linux-4.1.18/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
+ *
+ * Virtual Server: Context Accounting
+ *
-+ * Copyright (C) 2006-2007 Herbert Pötzl
++ * Copyright (C) 2006-2007 Herbert P?tzl
+ *
+ * V0.01 added accounting stats
+ *
+ return 0;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cacct_init.h linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct_init.h
---- linux-4.1.12/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct_init.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cacct_init.h linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct_init.h
+--- linux-4.1.18/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct_init.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cacct_proc.h linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct_proc.h
---- linux-4.1.12/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cacct_proc.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cacct_proc.h linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct_proc.h
+--- linux-4.1.18/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cacct_proc.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/context.c linux-4.1.12-vs2.3.8.3/kernel/vserver/context.c
---- linux-4.1.12/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/context.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/context.c linux-4.1.18-vs2.3.8.4/kernel/vserver/context.c
+--- linux-4.1.18/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/context.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
+ *
+ * Virtual Server: Context Support
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 context helper
+ * V0.02 vx_ctx_kill syscall command
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cvirt.c linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt.c
---- linux-4.1.12/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cvirt.c linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt.c
+--- linux-4.1.18/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
+ *
+ * Virtual Server: Context Virtualization
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from limit.c
+ * V0.02 added utsname stuff
+
+#endif
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cvirt_init.h linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt_init.h
---- linux-4.1.12/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt_init.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cvirt_init.h linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt_init.h
+--- linux-4.1.18/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt_init.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/cvirt_proc.h linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt_proc.h
---- linux-4.1.12/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/cvirt_proc.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/cvirt_proc.h linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt_proc.h
+--- linux-4.1.18/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/cvirt_proc.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/debug.c linux-4.1.12-vs2.3.8.3/kernel/vserver/debug.c
---- linux-4.1.12/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/debug.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/debug.c linux-4.1.18-vs2.3.8.4/kernel/vserver/debug.c
+--- linux-4.1.18/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/debug.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
+ *
-+ * Copyright (C) 2005-2007 Herbert Pötzl
++ * Copyright (C) 2005-2007 Herbert P?tzl
+ *
+ * V0.01 vx_info dump support
+ *
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/device.c linux-4.1.12-vs2.3.8.3/kernel/vserver/device.c
---- linux-4.1.12/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/device.c 2015-07-24 16:24:35.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/device.c linux-4.1.18-vs2.3.8.4/kernel/vserver/device.c
+--- linux-4.1.18/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/device.c 2015-07-24 16:24:35.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
+ *
+ * Linux-VServer: Device Support
+ *
-+ * Copyright (C) 2006 Herbert Pötzl
++ * Copyright (C) 2006 Herbert P?tzl
+ * Copyright (C) 2007 Daniel Hokka Zakrisson
+ *
+ * V0.01 device mapping basics
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/dlimit.c linux-4.1.12-vs2.3.8.3/kernel/vserver/dlimit.c
---- linux-4.1.12/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/dlimit.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/dlimit.c linux-4.1.18-vs2.3.8.4/kernel/vserver/dlimit.c
+--- linux-4.1.18/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/dlimit.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
+ *
+ * Virtual Server: Context Disk Limits
+ *
-+ * Copyright (C) 2004-2009 Herbert Pötzl
++ * Copyright (C) 2004-2009 Herbert P?tzl
+ *
+ * V0.01 initial version
+ * V0.02 compat32 splitup
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/helper.c linux-4.1.12-vs2.3.8.3/kernel/vserver/helper.c
---- linux-4.1.12/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/helper.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/helper.c linux-4.1.18-vs2.3.8.4/kernel/vserver/helper.c
+--- linux-4.1.18/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/helper.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic helper
+ *
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/history.c linux-4.1.12-vs2.3.8.3/kernel/vserver/history.c
---- linux-4.1.12/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/history.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/history.c linux-4.1.18-vs2.3.8.4/kernel/vserver/history.c
+--- linux-4.1.18/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/history.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
+ *
+ * Virtual Context History Backtrace
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 hash/unhash and trace
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/inet.c linux-4.1.12-vs2.3.8.3/kernel/vserver/inet.c
---- linux-4.1.12/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/inet.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/inet.c linux-4.1.18-vs2.3.8.4/kernel/vserver/inet.c
+--- linux-4.1.18/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/inet.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/init.c linux-4.1.12-vs2.3.8.3/kernel/vserver/init.c
---- linux-4.1.12/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/init.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/init.c linux-4.1.18-vs2.3.8.4/kernel/vserver/init.c
+--- linux-4.1.18/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/init.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
+ *
+ * Virtual Server Init
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/inode.c linux-4.1.12-vs2.3.8.3/kernel/vserver/inode.c
---- linux-4.1.12/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/inode.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/inode.c linux-4.1.18-vs2.3.8.4/kernel/vserver/inode.c
+--- linux-4.1.18/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/inode.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
+ *
+ * Virtual Server: File System Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 separated from vcontext V0.05
+ * V0.02 moved to tag (instead of xid)
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/limit.c linux-4.1.12-vs2.3.8.3/kernel/vserver/limit.c
---- linux-4.1.12/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/limit.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/limit.c linux-4.1.18-vs2.3.8.4/kernel/vserver/limit.c
+--- linux-4.1.18/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/limit.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
+ *
+ * Virtual Server: Context Limits
+ *
-+ * Copyright (C) 2004-2010 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
+ return cache;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/limit_init.h linux-4.1.12-vs2.3.8.3/kernel/vserver/limit_init.h
---- linux-4.1.12/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/limit_init.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/limit_init.h linux-4.1.18-vs2.3.8.4/kernel/vserver/limit_init.h
+--- linux-4.1.18/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/limit_init.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/limit_proc.h linux-4.1.12-vs2.3.8.3/kernel/vserver/limit_proc.h
---- linux-4.1.12/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/limit_proc.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/limit_proc.h linux-4.1.18-vs2.3.8.4/kernel/vserver/limit_proc.h
+--- linux-4.1.18/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/limit_proc.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/network.c linux-4.1.12-vs2.3.8.3/kernel/vserver/network.c
---- linux-4.1.12/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/network.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/network.c linux-4.1.18-vs2.3.8.4/kernel/vserver/network.c
+--- linux-4.1.18/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/network.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
+ *
+ * Virtual Server: Network Support
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 cleaned up implementation
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/proc.c linux-4.1.12-vs2.3.8.3/kernel/vserver/proc.c
---- linux-4.1.12/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/proc.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/proc.c linux-4.1.18-vs2.3.8.4/kernel/vserver/proc.c
+--- linux-4.1.18/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/proc.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,1100 @@
+/*
+ * linux/kernel/vserver/proc.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ * V0.02 adaptation vs1.3.0
+ return 0;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/sched.c linux-4.1.12-vs2.3.8.3/kernel/vserver/sched.c
---- linux-4.1.12/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/sched.c 2015-07-06 21:44:34.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/sched.c linux-4.1.18-vs2.3.8.4/kernel/vserver/sched.c
+--- linux-4.1.18/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/sched.c 2015-07-06 21:44:34.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
+ *
+ * Virtual Server: Scheduler Support
+ *
-+ * Copyright (C) 2004-2010 Herbert Pötzl
++ * Copyright (C) 2004-2010 Herbert P?tzl
+ *
+ * V0.01 adapted Sam Vilains version to 2.6.3
+ * V0.02 removed legacy interface
+ return 0;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/sched_init.h linux-4.1.12-vs2.3.8.3/kernel/vserver/sched_init.h
---- linux-4.1.12/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/sched_init.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/sched_init.h linux-4.1.18-vs2.3.8.4/kernel/vserver/sched_init.h
+--- linux-4.1.18/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/sched_init.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/sched_proc.h linux-4.1.12-vs2.3.8.3/kernel/vserver/sched_proc.h
---- linux-4.1.12/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/sched_proc.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/sched_proc.h linux-4.1.18-vs2.3.8.4/kernel/vserver/sched_proc.h
+--- linux-4.1.18/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/sched_proc.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/signal.c linux-4.1.12-vs2.3.8.3/kernel/vserver/signal.c
---- linux-4.1.12/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/signal.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/signal.c linux-4.1.18-vs2.3.8.4/kernel/vserver/signal.c
+--- linux-4.1.18/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/signal.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
+ *
+ * Virtual Server: Signal Support
+ *
-+ * Copyright (C) 2003-2007 Herbert Pötzl
++ * Copyright (C) 2003-2007 Herbert P?tzl
+ *
+ * V0.01 broken out from vcontext V0.05
+ * V0.02 changed vcmds to vxi arg
+ return ret;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/space.c linux-4.1.12-vs2.3.8.3/kernel/vserver/space.c
---- linux-4.1.12/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/space.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/space.c linux-4.1.18-vs2.3.8.4/kernel/vserver/space.c
+--- linux-4.1.18/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/space.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
+ *
+ * Virtual Server: Context Space Support
+ *
-+ * Copyright (C) 2003-2010 Herbert Pötzl
++ * Copyright (C) 2003-2010 Herbert P?tzl
+ *
+ * V0.01 broken out from context.c 0.07
+ * V0.02 added task locking for namespace
+ return 0;
+}
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/switch.c linux-4.1.12-vs2.3.8.3/kernel/vserver/switch.c
---- linux-4.1.12/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/switch.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/switch.c linux-4.1.18-vs2.3.8.4/kernel/vserver/switch.c
+--- linux-4.1.18/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/switch.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
+ *
+ * Virtual Server: Syscall Switch
+ *
-+ * Copyright (C) 2003-2011 Herbert Pötzl
++ * Copyright (C) 2003-2011 Herbert P?tzl
+ *
+ * V0.01 syscall switch
+ * V0.02 added signal to context
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/sysctl.c linux-4.1.12-vs2.3.8.3/kernel/vserver/sysctl.c
---- linux-4.1.12/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/sysctl.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/sysctl.c linux-4.1.18-vs2.3.8.4/kernel/vserver/sysctl.c
+--- linux-4.1.18/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/sysctl.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
+ *
+ * Virtual Context Support
+ *
-+ * Copyright (C) 2004-2007 Herbert Pötzl
++ * Copyright (C) 2004-2007 Herbert P?tzl
+ *
+ * V0.01 basic structure
+ *
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/tag.c linux-4.1.12-vs2.3.8.3/kernel/vserver/tag.c
---- linux-4.1.12/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/tag.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/tag.c linux-4.1.18-vs2.3.8.4/kernel/vserver/tag.c
+--- linux-4.1.18/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/tag.c 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
+ *
+ * Virtual Server: Shallow Tag Space
+ *
-+ * Copyright (C) 2007 Herbert Pötzl
++ * Copyright (C) 2007 Herbert P?tzl
+ *
+ * V0.01 basic implementation
+ *
+}
+
+
-diff -NurpP --minimal linux-4.1.12/kernel/vserver/vci_config.h linux-4.1.12-vs2.3.8.3/kernel/vserver/vci_config.h
---- linux-4.1.12/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/kernel/vserver/vci_config.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/kernel/vserver/vci_config.h linux-4.1.18-vs2.3.8.4/kernel/vserver/vci_config.h
+--- linux-4.1.18/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/kernel/vserver/vci_config.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-4.1.12/mm/oom_kill.c linux-4.1.12-vs2.3.8.3/mm/oom_kill.c
---- linux-4.1.12/mm/oom_kill.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/oom_kill.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/oom_kill.c linux-4.1.18-vs2.3.8.4/mm/oom_kill.c
+--- linux-4.1.18/mm/oom_kill.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/oom_kill.c 2015-07-06 20:43:44.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
}
if (p != (void *)-1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-4.1.12/mm/page_alloc.c linux-4.1.12-vs2.3.8.3/mm/page_alloc.c
---- linux-4.1.12/mm/page_alloc.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/page_alloc.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/page_alloc.c linux-4.1.18-vs2.3.8.4/mm/page_alloc.c
+--- linux-4.1.18/mm/page_alloc.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/page_alloc.c 2015-10-29 09:25:27.000000000 +0000
@@ -61,6 +61,8 @@
#include <linux/hugetlb.h>
#include <linux/sched/rt.h>
}
#endif
-diff -NurpP --minimal linux-4.1.12/mm/pgtable-generic.c linux-4.1.12-vs2.3.8.3/mm/pgtable-generic.c
---- linux-4.1.12/mm/pgtable-generic.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/pgtable-generic.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/pgtable-generic.c linux-4.1.18-vs2.3.8.4/mm/pgtable-generic.c
+--- linux-4.1.18/mm/pgtable-generic.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/pgtable-generic.c 2015-07-06 20:43:44.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-4.1.12/mm/shmem.c linux-4.1.12-vs2.3.8.3/mm/shmem.c
---- linux-4.1.12/mm/shmem.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/shmem.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/shmem.c linux-4.1.18-vs2.3.8.4/mm/shmem.c
+--- linux-4.1.18/mm/shmem.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/shmem.c 2015-07-06 20:43:44.000000000 +0000
@@ -2180,7 +2180,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-4.1.12/mm/slab.c linux-4.1.12-vs2.3.8.3/mm/slab.c
---- linux-4.1.12/mm/slab.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/slab.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/slab.c linux-4.1.18-vs2.3.8.4/mm/slab.c
+--- linux-4.1.18/mm/slab.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/slab.c 2015-10-29 09:25:27.000000000 +0000
@@ -336,6 +336,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-4.1.12/mm/slab_vs.h linux-4.1.12-vs2.3.8.3/mm/slab_vs.h
---- linux-4.1.12/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/slab_vs.h 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/slab_vs.h linux-4.1.18-vs2.3.8.4/mm/slab_vs.h
+--- linux-4.1.18/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/slab_vs.h 2015-07-06 20:43:44.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-4.1.12/mm/swapfile.c linux-4.1.12-vs2.3.8.3/mm/swapfile.c
---- linux-4.1.12/mm/swapfile.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/mm/swapfile.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/mm/swapfile.c linux-4.1.18-vs2.3.8.4/mm/swapfile.c
+--- linux-4.1.18/mm/swapfile.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/mm/swapfile.c 2015-07-06 20:43:44.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-4.1.12/net/bridge/br_multicast.c linux-4.1.12-vs2.3.8.3/net/bridge/br_multicast.c
---- linux-4.1.12/net/bridge/br_multicast.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/bridge/br_multicast.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/bridge/br_multicast.c linux-4.1.18-vs2.3.8.4/net/bridge/br_multicast.c
+--- linux-4.1.18/net/bridge/br_multicast.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/bridge/br_multicast.c 2015-10-29 09:25:27.000000000 +0000
@@ -448,7 +448,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-4.1.12/net/core/dev.c linux-4.1.12-vs2.3.8.3/net/core/dev.c
---- linux-4.1.12/net/core/dev.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/core/dev.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/core/dev.c linux-4.1.18-vs2.3.8.4/net/core/dev.c
+--- linux-4.1.18/net/core/dev.c 2016-02-18 18:02:00.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/core/dev.c 2016-02-19 03:14:23.000000000 +0000
@@ -123,6 +123,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-diff -NurpP --minimal linux-4.1.12/net/core/net-procfs.c linux-4.1.12-vs2.3.8.3/net/core/net-procfs.c
---- linux-4.1.12/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/core/net-procfs.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/core/net-procfs.c linux-4.1.18-vs2.3.8.4/net/core/net-procfs.c
+--- linux-4.1.18/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/core/net-procfs.c 2015-07-06 20:43:44.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/netdevice.h>
#include <linux/proc_fs.h>
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.1.12/net/core/rtnetlink.c linux-4.1.12-vs2.3.8.3/net/core/rtnetlink.c
---- linux-4.1.12/net/core/rtnetlink.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/core/rtnetlink.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/core/rtnetlink.c linux-4.1.18-vs2.3.8.4/net/core/rtnetlink.c
+--- linux-4.1.18/net/core/rtnetlink.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/core/rtnetlink.c 2015-10-29 09:25:27.000000000 +0000
@@ -1350,6 +1350,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry(dev, head, index_hlist) {
if (idx < s_idx)
if (dev->reg_state != NETREG_REGISTERED)
return;
-diff -NurpP --minimal linux-4.1.12/net/core/sock.c linux-4.1.12-vs2.3.8.3/net/core/sock.c
---- linux-4.1.12/net/core/sock.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/core/sock.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/core/sock.c linux-4.1.18-vs2.3.8.4/net/core/sock.c
+--- linux-4.1.18/net/core/sock.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/core/sock.c 2016-02-19 03:14:23.000000000 +0000
@@ -133,6 +133,10 @@
#include <net/netprio_cgroup.h>
#include <trace/events/sock.h>
-@@ -1347,6 +1351,8 @@ static struct sock *sk_prot_alloc(struct
+@@ -1346,6 +1350,8 @@ static struct sock *sk_prot_alloc(struct
goto out_free_sec;
sk_tx_queue_clear(sk);
}
return sk;
-@@ -1443,6 +1449,11 @@ static void __sk_free(struct sock *sk)
+@@ -1442,6 +1448,11 @@ static void __sk_free(struct sock *sk)
put_cred(sk->sk_peer_cred);
put_pid(sk->sk_peer_pid);
put_net(sock_net(sk));
sk_prot_free(sk->sk_prot_creator, sk);
}
-@@ -1503,6 +1514,8 @@ struct sock *sk_clone_lock(const struct
+@@ -1502,6 +1513,8 @@ struct sock *sk_clone_lock(const struct
/* SANITY */
get_net(sock_net(newsk));
sk_node_init(&newsk->sk_node);
sock_lock_init(newsk);
bh_lock_sock(newsk);
-@@ -1562,6 +1575,12 @@ struct sock *sk_clone_lock(const struct
+@@ -1561,6 +1574,12 @@ struct sock *sk_clone_lock(const struct
smp_wmb();
atomic_set(&newsk->sk_refcnt, 2);
/*
* Increment the counter in the same struct proto as the master
* sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that
-@@ -2346,6 +2365,12 @@ void sock_init_data(struct socket *sock,
+@@ -2345,6 +2364,12 @@ void sock_init_data(struct socket *sock,
sk->sk_stamp = ktime_set(-1L, 0);
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
sk->sk_ll_usec = sysctl_net_busy_read;
-diff -NurpP --minimal linux-4.1.12/net/ipv4/af_inet.c linux-4.1.12-vs2.3.8.3/net/ipv4/af_inet.c
---- linux-4.1.12/net/ipv4/af_inet.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/af_inet.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/af_inet.c linux-4.1.18-vs2.3.8.4/net/ipv4/af_inet.c
+--- linux-4.1.18/net/ipv4/af_inet.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/af_inet.c 2016-02-19 03:14:23.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
/* The inetsw table contains everything that inet_create needs to
-@@ -307,10 +308,13 @@ lookup_protocol:
+@@ -310,10 +311,13 @@ lookup_protocol:
}
err = -EPERM;
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_flags = answer->flags;
-@@ -423,6 +427,7 @@ int inet_bind(struct socket *sock, struc
+@@ -426,6 +430,7 @@ int inet_bind(struct socket *sock, struc
struct sockaddr_in *addr = (struct sockaddr_in *)uaddr;
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
struct net *net = sock_net(sk);
unsigned short snum;
int chk_addr_ret;
-@@ -447,7 +452,11 @@ int inet_bind(struct socket *sock, struc
+@@ -450,7 +455,11 @@ int inet_bind(struct socket *sock, struc
goto out;
}
/* Not specified by any standard per-se, however it breaks too
* many applications when removed. It is unfortunate since
-@@ -459,7 +468,7 @@ int inet_bind(struct socket *sock, struc
+@@ -462,7 +471,7 @@ int inet_bind(struct socket *sock, struc
err = -EADDRNOTAVAIL;
if (!net->ipv4.sysctl_ip_nonlocal_bind &&
!(inet->freebind || inet->transparent) &&
chk_addr_ret != RTN_LOCAL &&
chk_addr_ret != RTN_MULTICAST &&
chk_addr_ret != RTN_BROADCAST)
-@@ -485,7 +494,7 @@ int inet_bind(struct socket *sock, struc
+@@ -488,7 +497,7 @@ int inet_bind(struct socket *sock, struc
if (sk->sk_state != TCP_CLOSE || inet->inet_num)
goto out_release_sock;
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->inet_saddr = 0; /* Use device */
-@@ -704,11 +713,13 @@ int inet_getname(struct socket *sock, st
+@@ -707,11 +716,13 @@ int inet_getname(struct socket *sock, st
peer == 1))
return -ENOTCONN;
sin->sin_port = inet->inet_dport;
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-4.1.12/net/ipv4/arp.c linux-4.1.12-vs2.3.8.3/net/ipv4/arp.c
---- linux-4.1.12/net/ipv4/arp.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/arp.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/arp.c linux-4.1.18-vs2.3.8.4/net/ipv4/arp.c
+--- linux-4.1.18/net/ipv4/arp.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/arp.c 2015-07-06 20:43:44.000000000 +0000
@@ -1257,6 +1257,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
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.1.12/net/ipv4/devinet.c linux-4.1.12-vs2.3.8.3/net/ipv4/devinet.c
---- linux-4.1.12/net/ipv4/devinet.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/devinet.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/devinet.c linux-4.1.18-vs2.3.8.4/net/ipv4/devinet.c
+--- linux-4.1.18/net/ipv4/devinet.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/devinet.c 2015-07-06 20:43:44.000000000 +0000
@@ -534,6 +534,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-4.1.12/net/ipv4/fib_trie.c linux-4.1.12-vs2.3.8.3/net/ipv4/fib_trie.c
---- linux-4.1.12/net/ipv4/fib_trie.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/fib_trie.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/fib_trie.c linux-4.1.18-vs2.3.8.4/net/ipv4/fib_trie.c
+--- linux-4.1.18/net/ipv4/fib_trie.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/fib_trie.c 2016-02-19 03:14:23.000000000 +0000
@@ -2576,6 +2576,7 @@ static int fib_route_seq_show(struct seq
seq_setwidth(seq, 127);
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-4.1.12/net/ipv4/inet_connection_sock.c linux-4.1.12-vs2.3.8.3/net/ipv4/inet_connection_sock.c
---- linux-4.1.12/net/ipv4/inet_connection_sock.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/inet_connection_sock.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/inet_connection_sock.c linux-4.1.18-vs2.3.8.4/net/ipv4/inet_connection_sock.c
+--- linux-4.1.18/net/ipv4/inet_connection_sock.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/inet_connection_sock.c 2015-10-29 09:25:27.000000000 +0000
@@ -43,6 +43,37 @@ void inet_get_local_port_range(struct ne
}
EXPORT_SYMBOL(inet_get_local_port_range);
break;
}
}
-diff -NurpP --minimal linux-4.1.12/net/ipv4/inet_diag.c linux-4.1.12-vs2.3.8.3/net/ipv4/inet_diag.c
---- linux-4.1.12/net/ipv4/inet_diag.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/inet_diag.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/inet_diag.c linux-4.1.18-vs2.3.8.4/net/ipv4/inet_diag.c
+--- linux-4.1.18/net/ipv4/inet_diag.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/inet_diag.c 2015-07-06 20:43:44.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
if (num < s_num)
goto next_normal;
state = (sk->sk_state == TCP_TIME_WAIT) ?
-diff -NurpP --minimal linux-4.1.12/net/ipv4/inet_hashtables.c linux-4.1.12-vs2.3.8.3/net/ipv4/inet_hashtables.c
---- linux-4.1.12/net/ipv4/inet_hashtables.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/inet_hashtables.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/inet_hashtables.c linux-4.1.18-vs2.3.8.4/net/ipv4/inet_hashtables.c
+--- linux-4.1.18/net/ipv4/inet_hashtables.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/inet_hashtables.c 2015-07-06 20:43:44.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
/*
* 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.1.12/net/ipv4/netfilter.c linux-4.1.12-vs2.3.8.3/net/ipv4/netfilter.c
---- linux-4.1.12/net/ipv4/netfilter.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/netfilter.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/netfilter.c linux-4.1.18-vs2.3.8.4/net/ipv4/netfilter.c
+--- linux-4.1.18/net/ipv4/netfilter.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/netfilter.c 2015-07-06 20:43:44.000000000 +0000
@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-4.1.12/net/ipv4/raw.c linux-4.1.12-vs2.3.8.3/net/ipv4/raw.c
---- linux-4.1.12/net/ipv4/raw.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/raw.c 2015-07-06 21:14:18.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/raw.c linux-4.1.18-vs2.3.8.4/net/ipv4/raw.c
+--- linux-4.1.18/net/ipv4/raw.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/raw.c 2015-07-06 21:14:18.000000000 +0000
@@ -126,7 +126,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-4.1.12/net/ipv4/route.c linux-4.1.12-vs2.3.8.3/net/ipv4/route.c
---- linux-4.1.12/net/ipv4/route.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/route.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/route.c linux-4.1.18-vs2.3.8.4/net/ipv4/route.c
+--- linux-4.1.18/net/ipv4/route.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/route.c 2015-07-06 20:43:44.000000000 +0000
@@ -2086,7 +2086,7 @@ struct rtable *__ip_route_output_key(str
rth = ERR_PTR(-ENODEV);
if (!dev_out)
goto out;
-diff -NurpP --minimal linux-4.1.12/net/ipv4/tcp.c linux-4.1.12-vs2.3.8.3/net/ipv4/tcp.c
---- linux-4.1.12/net/ipv4/tcp.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/tcp.c 2015-07-24 14:11:50.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/tcp.c linux-4.1.18-vs2.3.8.4/net/ipv4/tcp.c
+--- linux-4.1.18/net/ipv4/tcp.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/tcp.c 2015-07-24 14:11:50.000000000 +0000
@@ -269,6 +269,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
#include <net/icmp.h>
#include <net/inet_common.h>
-diff -NurpP --minimal linux-4.1.12/net/ipv4/tcp_ipv4.c linux-4.1.12-vs2.3.8.3/net/ipv4/tcp_ipv4.c
---- linux-4.1.12/net/ipv4/tcp_ipv4.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/tcp_ipv4.c 2015-10-29 10:24:36.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/tcp_ipv4.c linux-4.1.18-vs2.3.8.4/net/ipv4/tcp_ipv4.c
+--- linux-4.1.18/net/ipv4/tcp_ipv4.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/tcp_ipv4.c 2016-02-19 03:14:23.000000000 +0000
@@ -1843,6 +1843,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-4.1.12/net/ipv4/tcp_minisocks.c linux-4.1.12-vs2.3.8.3/net/ipv4/tcp_minisocks.c
---- linux-4.1.12/net/ipv4/tcp_minisocks.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/tcp_minisocks.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/tcp_minisocks.c linux-4.1.18-vs2.3.8.4/net/ipv4/tcp_minisocks.c
+--- linux-4.1.18/net/ipv4/tcp_minisocks.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/tcp_minisocks.c 2016-02-19 03:14:23.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-4.1.12/net/ipv4/udp.c linux-4.1.12-vs2.3.8.3/net/ipv4/udp.c
---- linux-4.1.12/net/ipv4/udp.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv4/udp.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv4/udp.c linux-4.1.18-vs2.3.8.4/net/ipv4/udp.c
+--- linux-4.1.18/net/ipv4/udp.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv4/udp.c 2015-10-29 09:25:27.000000000 +0000
@@ -310,14 +310,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-4.1.12/net/ipv6/Kconfig linux-4.1.12-vs2.3.8.3/net/ipv6/Kconfig
---- linux-4.1.12/net/ipv6/Kconfig 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/Kconfig 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/Kconfig linux-4.1.18-vs2.3.8.4/net/ipv6/Kconfig
+--- linux-4.1.18/net/ipv6/Kconfig 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/Kconfig 2015-07-06 20:43:44.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-4.1.12/net/ipv6/addrconf.c linux-4.1.12-vs2.3.8.3/net/ipv6/addrconf.c
---- linux-4.1.12/net/ipv6/addrconf.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/addrconf.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/addrconf.c linux-4.1.18-vs2.3.8.4/net/ipv6/addrconf.c
+--- linux-4.1.18/net/ipv6/addrconf.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/addrconf.c 2016-02-19 03:14:23.000000000 +0000
@@ -91,6 +91,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
/* Set to 3 to get tracing... */
#define ACONF_DEBUG 2
-@@ -1360,7 +1362,7 @@ out:
+@@ -1367,7 +1369,7 @@ out:
int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev,
const struct in6_addr *daddr, unsigned int prefs,
{
struct ipv6_saddr_score scores[2],
*score = &scores[0], *hiscore = &scores[1];
-@@ -1430,6 +1432,8 @@ int ipv6_dev_get_saddr(struct net *net,
+@@ -1437,6 +1439,8 @@ int ipv6_dev_get_saddr(struct net *net,
dev->name);
continue;
}
score->rule = -1;
bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX);
-@@ -3741,7 +3745,10 @@ static void if6_seq_stop(struct seq_file
+@@ -3748,7 +3752,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
&ifp->addr,
ifp->idev->dev->ifindex,
ifp->prefix_len,
-@@ -4325,6 +4332,11 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4332,6 +4339,11 @@ static int in6_dump_addrs(struct inet6_d
struct ifacaddr6 *ifaca;
int err = 1;
int ip_idx = *p_ip_idx;
read_lock_bh(&idev->lock);
switch (type) {
-@@ -4335,6 +4347,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4342,6 +4354,8 @@ static int in6_dump_addrs(struct inet6_d
list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4352,6 +4366,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4359,6 +4373,8 @@ static int in6_dump_addrs(struct inet6_d
ifmca = ifmca->next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifmcaddr(skb, ifmca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4367,6 +4383,8 @@ static int in6_dump_addrs(struct inet6_d
+@@ -4374,6 +4390,8 @@ static int in6_dump_addrs(struct inet6_d
ifaca = ifaca->aca_next, ip_idx++) {
if (ip_idx < s_ip_idx)
continue;
err = inet6_fill_ifacaddr(skb, ifaca,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
-@@ -4395,6 +4413,10 @@ static int inet6_dump_addr(struct sk_buf
+@@ -4402,6 +4420,10 @@ static int inet6_dump_addr(struct sk_buf
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = idx = cb->args[1];
s_ip_idx = ip_idx = cb->args[2];
-@@ -4885,6 +4907,7 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4892,6 +4914,7 @@ static int inet6_dump_ifinfo(struct sk_b
struct net_device *dev;
struct inet6_dev *idev;
struct hlist_head *head;
s_h = cb->args[0];
s_idx = cb->args[1];
-@@ -4896,6 +4919,8 @@ static int inet6_dump_ifinfo(struct sk_b
+@@ -4903,6 +4926,8 @@ static int inet6_dump_ifinfo(struct sk_b
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
goto cont;
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-4.1.12/net/ipv6/af_inet6.c linux-4.1.12-vs2.3.8.3/net/ipv6/af_inet6.c
---- linux-4.1.12/net/ipv6/af_inet6.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/af_inet6.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/af_inet6.c linux-4.1.18-vs2.3.8.4/net/ipv6/af_inet6.c
+--- linux-4.1.18/net/ipv6/af_inet6.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/af_inet6.c 2016-02-19 03:14:23.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
#include <net/ip.h>
#include <net/ipv6.h>
-@@ -155,10 +157,13 @@ lookup_protocol:
+@@ -158,10 +160,13 @@ lookup_protocol:
}
err = -EPERM;
sock->ops = answer->ops;
answer_prot = answer->prot;
answer_flags = answer->flags;
-@@ -256,6 +261,7 @@ int inet6_bind(struct socket *sock, stru
+@@ -259,6 +264,7 @@ int inet6_bind(struct socket *sock, stru
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct net *net = sock_net(sk);
__be32 v4addr = 0;
unsigned short snum;
int addr_type = 0;
-@@ -271,6 +277,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -274,6 +280,10 @@ int inet6_bind(struct socket *sock, stru
if (addr->sin6_family != AF_INET6)
return -EAFNOSUPPORT;
addr_type = ipv6_addr_type(&addr->sin6_addr);
if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM)
return -EINVAL;
-@@ -311,6 +321,10 @@ int inet6_bind(struct socket *sock, stru
+@@ -314,6 +324,10 @@ int inet6_bind(struct socket *sock, stru
err = -EADDRNOTAVAIL;
goto out;
}
} else {
if (addr_type != IPV6_ADDR_ANY) {
struct net_device *dev = NULL;
-@@ -337,6 +351,11 @@ int inet6_bind(struct socket *sock, stru
+@@ -340,6 +354,11 @@ int inet6_bind(struct socket *sock, stru
}
}
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-@@ -353,6 +372,9 @@ int inet6_bind(struct socket *sock, stru
+@@ -356,6 +375,9 @@ int inet6_bind(struct socket *sock, stru
}
}
inet->inet_rcv_saddr = v4addr;
inet->inet_saddr = v4addr;
-@@ -454,9 +476,11 @@ int inet6_getname(struct socket *sock, s
+@@ -459,9 +481,11 @@ int inet6_getname(struct socket *sock, s
return -ENOTCONN;
sin->sin6_port = inet->inet_dport;
sin->sin6_addr = sk->sk_v6_daddr;
if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-4.1.12/net/ipv6/datagram.c linux-4.1.12-vs2.3.8.3/net/ipv6/datagram.c
---- linux-4.1.12/net/ipv6/datagram.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/datagram.c 2015-10-29 09:25:27.000000000 +0000
-@@ -724,7 +724,7 @@ int ip6_datagram_send_ctl(struct net *ne
+diff -NurpP --minimal linux-4.1.18/net/ipv6/datagram.c linux-4.1.18-vs2.3.8.4/net/ipv6/datagram.c
+--- linux-4.1.18/net/ipv6/datagram.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/datagram.c 2016-02-19 03:14:23.000000000 +0000
+@@ -726,7 +726,7 @@ int ip6_datagram_send_ctl(struct net *ne
rcu_read_lock();
if (fl6->flowi6_oif) {
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-4.1.12/net/ipv6/fib6_rules.c linux-4.1.12-vs2.3.8.3/net/ipv6/fib6_rules.c
---- linux-4.1.12/net/ipv6/fib6_rules.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/fib6_rules.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/fib6_rules.c linux-4.1.18-vs2.3.8.4/net/ipv6/fib6_rules.c
+--- linux-4.1.18/net/ipv6/fib6_rules.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/fib6_rules.c 2015-07-06 20:43:44.000000000 +0000
@@ -97,7 +97,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-4.1.12/net/ipv6/inet6_hashtables.c linux-4.1.12-vs2.3.8.3/net/ipv6/inet6_hashtables.c
---- linux-4.1.12/net/ipv6/inet6_hashtables.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/inet6_hashtables.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/inet6_hashtables.c linux-4.1.18-vs2.3.8.4/net/ipv6/inet6_hashtables.c
+--- linux-4.1.18/net/ipv6/inet6_hashtables.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/inet6_hashtables.c 2015-07-06 20:43:44.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-4.1.12/net/ipv6/ip6_fib.c linux-4.1.12-vs2.3.8.3/net/ipv6/ip6_fib.c
---- linux-4.1.12/net/ipv6/ip6_fib.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/ip6_fib.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/ip6_fib.c linux-4.1.18-vs2.3.8.4/net/ipv6/ip6_fib.c
+--- linux-4.1.18/net/ipv6/ip6_fib.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/ip6_fib.c 2015-07-06 20:43:44.000000000 +0000
@@ -1888,6 +1888,7 @@ static int ipv6_route_seq_show(struct se
struct rt6_info *rt = v;
struct ipv6_route_iter *iter = seq->private;
seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-4.1.12/net/ipv6/ip6_output.c linux-4.1.12-vs2.3.8.3/net/ipv6/ip6_output.c
---- linux-4.1.12/net/ipv6/ip6_output.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/ip6_output.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/ip6_output.c linux-4.1.18-vs2.3.8.4/net/ipv6/ip6_output.c
+--- linux-4.1.18/net/ipv6/ip6_output.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/ip6_output.c 2016-02-19 03:14:23.000000000 +0000
@@ -904,7 +904,8 @@ static int ip6_dst_lookup_tail(struct so
rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
if (err)
goto out_err_release;
-diff -NurpP --minimal linux-4.1.12/net/ipv6/ndisc.c linux-4.1.12-vs2.3.8.3/net/ipv6/ndisc.c
---- linux-4.1.12/net/ipv6/ndisc.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/ndisc.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/ndisc.c linux-4.1.18-vs2.3.8.4/net/ipv6/ndisc.c
+--- linux-4.1.18/net/ipv6/ndisc.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/ndisc.c 2015-07-06 20:43:44.000000000 +0000
@@ -497,7 +497,7 @@ void ndisc_send_na(struct net_device *de
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-4.1.12/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.1.12-vs2.3.8.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
---- linux-4.1.12/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.1.18-vs2.3.8.4/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+--- linux-4.1.18/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2015-07-06 20:43:44.000000000 +0000
@@ -35,7 +35,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s
ctinfo == IP_CT_RELATED_REPLY));
return NF_DROP;
nfct_nat(ct)->masq_index = out->ifindex;
-diff -NurpP --minimal linux-4.1.12/net/ipv6/raw.c linux-4.1.12-vs2.3.8.3/net/ipv6/raw.c
---- linux-4.1.12/net/ipv6/raw.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/raw.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/raw.c linux-4.1.18-vs2.3.8.4/net/ipv6/raw.c
+--- linux-4.1.18/net/ipv6/raw.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/raw.c 2016-02-19 03:14:23.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-4.1.12/net/ipv6/route.c linux-4.1.12-vs2.3.8.3/net/ipv6/route.c
---- linux-4.1.12/net/ipv6/route.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/route.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/route.c linux-4.1.18-vs2.3.8.4/net/ipv6/route.c
+--- linux-4.1.18/net/ipv6/route.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/route.c 2015-10-29 09:25:27.000000000 +0000
@@ -58,6 +58,7 @@
#include <net/netevent.h>
#include <net/netlink.h>
nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
goto nla_put_failure;
}
-diff -NurpP --minimal linux-4.1.12/net/ipv6/tcp_ipv6.c linux-4.1.12-vs2.3.8.3/net/ipv6/tcp_ipv6.c
---- linux-4.1.12/net/ipv6/tcp_ipv6.c 2015-10-29 09:20:38.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/tcp_ipv6.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/tcp_ipv6.c linux-4.1.18-vs2.3.8.4/net/ipv6/tcp_ipv6.c
+--- linux-4.1.18/net/ipv6/tcp_ipv6.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/tcp_ipv6.c 2016-02-19 03:14:23.000000000 +0000
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-4.1.12/net/ipv6/udp.c linux-4.1.12-vs2.3.8.3/net/ipv6/udp.c
---- linux-4.1.12/net/ipv6/udp.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/udp.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/udp.c linux-4.1.18-vs2.3.8.4/net/ipv6/udp.c
+--- linux-4.1.18/net/ipv6/udp.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/udp.c 2016-02-19 03:14:23.000000000 +0000
@@ -47,6 +47,7 @@
#include <net/xfrm.h>
#include <net/inet6_hashtables.h>
}
if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) {
-diff -NurpP --minimal linux-4.1.12/net/ipv6/xfrm6_policy.c linux-4.1.12-vs2.3.8.3/net/ipv6/xfrm6_policy.c
---- linux-4.1.12/net/ipv6/xfrm6_policy.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/ipv6/xfrm6_policy.c 2015-07-06 20:52:06.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/ipv6/xfrm6_policy.c linux-4.1.18-vs2.3.8.4/net/ipv6/xfrm6_policy.c
+--- linux-4.1.18/net/ipv6/xfrm6_policy.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/ipv6/xfrm6_policy.c 2016-02-19 03:14:23.000000000 +0000
@@ -61,7 +61,8 @@ static int xfrm6_get_saddr(struct net *n
return -EHOSTUNREACH;
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-4.1.12/net/netfilter/ipvs/ip_vs_xmit.c linux-4.1.12-vs2.3.8.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-4.1.12/net/netfilter/ipvs/ip_vs_xmit.c 2015-10-29 09:20:39.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/netfilter/ipvs/ip_vs_xmit.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/netfilter/ipvs/ip_vs_xmit.c linux-4.1.18-vs2.3.8.4/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-4.1.18/net/netfilter/ipvs/ip_vs_xmit.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/netfilter/ipvs/ip_vs_xmit.c 2015-10-29 09:25:27.000000000 +0000
@@ -377,7 +377,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-4.1.12/net/netlink/af_netlink.c linux-4.1.12-vs2.3.8.3/net/netlink/af_netlink.c
---- linux-4.1.12/net/netlink/af_netlink.c 2015-10-29 09:20:39.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/netlink/af_netlink.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/netlink/af_netlink.c linux-4.1.18-vs2.3.8.4/net/netlink/af_netlink.c
+--- linux-4.1.18/net/netlink/af_netlink.c 2016-02-18 18:02:01.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/netlink/af_netlink.c 2016-02-19 03:14:23.000000000 +0000
@@ -62,6 +62,8 @@
#include <asm/cacheflush.h>
#include <linux/hash.h>
#include <net/net_namespace.h>
#include <net/sock.h>
-@@ -3018,7 +3020,8 @@ static void *__netlink_seq_next(struct s
+@@ -3019,7 +3021,8 @@ static void *__netlink_seq_next(struct s
if (err)
return ERR_PTR(err);
}
return nlk;
}
-diff -NurpP --minimal linux-4.1.12/net/socket.c linux-4.1.12-vs2.3.8.3/net/socket.c
---- linux-4.1.12/net/socket.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/socket.c 2015-10-30 09:55:56.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/socket.c linux-4.1.18-vs2.3.8.4/net/socket.c
+--- linux-4.1.18/net/socket.c 2016-02-18 18:02:02.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/socket.c 2016-02-19 03:14:23.000000000 +0000
@@ -99,10 +99,12 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-4.1.12/net/sunrpc/auth.c linux-4.1.12-vs2.3.8.3/net/sunrpc/auth.c
---- linux-4.1.12/net/sunrpc/auth.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/sunrpc/auth.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/sunrpc/auth.c linux-4.1.18-vs2.3.8.4/net/sunrpc/auth.c
+--- linux-4.1.18/net/sunrpc/auth.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/sunrpc/auth.c 2015-07-06 20:43:44.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/gss_api.h>
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-4.1.12/net/sunrpc/auth_unix.c linux-4.1.12-vs2.3.8.3/net/sunrpc/auth_unix.c
---- linux-4.1.12/net/sunrpc/auth_unix.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/sunrpc/auth_unix.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/sunrpc/auth_unix.c linux-4.1.18-vs2.3.8.4/net/sunrpc/auth_unix.c
+--- linux-4.1.18/net/sunrpc/auth_unix.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/sunrpc/auth_unix.c 2015-07-06 20:43:44.000000000 +0000
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
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.1.12/net/sunrpc/clnt.c linux-4.1.12-vs2.3.8.3/net/sunrpc/clnt.c
---- linux-4.1.12/net/sunrpc/clnt.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/sunrpc/clnt.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/sunrpc/clnt.c linux-4.1.18-vs2.3.8.4/net/sunrpc/clnt.c
+--- linux-4.1.18/net/sunrpc/clnt.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/sunrpc/clnt.c 2015-07-06 20:43:44.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create_xprt);
-diff -NurpP --minimal linux-4.1.12/net/unix/af_unix.c linux-4.1.12-vs2.3.8.3/net/unix/af_unix.c
---- linux-4.1.12/net/unix/af_unix.c 2015-10-29 09:20:39.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/net/unix/af_unix.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/net/unix/af_unix.c linux-4.1.18-vs2.3.8.4/net/unix/af_unix.c
+--- linux-4.1.18/net/unix/af_unix.c 2016-02-18 18:02:02.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/net/unix/af_unix.c 2016-02-19 03:14:23.000000000 +0000
@@ -117,6 +117,8 @@
#include <net/checksum.h>
#include <linux/security.h>
if (u->addr->len == len &&
!memcmp(u->addr->name, sunname, len))
goto found;
-@@ -2281,6 +2285,8 @@ static struct sock *unix_from_bucket(str
+@@ -2435,6 +2439,8 @@ static struct sock *unix_from_bucket(str
for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) {
if (sock_net(sk) != seq_file_net(seq))
continue;
if (++count == offset)
break;
}
-@@ -2298,6 +2304,8 @@ static struct sock *unix_next_socket(str
+@@ -2452,6 +2458,8 @@ static struct sock *unix_next_socket(str
sk = sk_next(sk);
if (!sk)
goto next_bucket;
if (sock_net(sk) == seq_file_net(seq))
return sk;
}
-diff -NurpP --minimal linux-4.1.12/scripts/checksyscalls.sh linux-4.1.12-vs2.3.8.3/scripts/checksyscalls.sh
---- linux-4.1.12/scripts/checksyscalls.sh 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/scripts/checksyscalls.sh 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/scripts/checksyscalls.sh linux-4.1.18-vs2.3.8.4/scripts/checksyscalls.sh
+--- linux-4.1.18/scripts/checksyscalls.sh 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/scripts/checksyscalls.sh 2015-07-06 20:43:44.000000000 +0000
@@ -196,7 +196,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-4.1.12/security/commoncap.c linux-4.1.12-vs2.3.8.3/security/commoncap.c
---- linux-4.1.12/security/commoncap.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/security/commoncap.c 2015-07-06 20:43:44.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/security/commoncap.c linux-4.1.18-vs2.3.8.4/security/commoncap.c
+--- linux-4.1.18/security/commoncap.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/security/commoncap.c 2015-07-06 20:43:44.000000000 +0000
@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-4.1.12/security/selinux/hooks.c linux-4.1.12-vs2.3.8.3/security/selinux/hooks.c
---- linux-4.1.12/security/selinux/hooks.c 2015-10-29 09:20:39.000000000 +0000
-+++ linux-4.1.12-vs2.3.8.3/security/selinux/hooks.c 2015-10-29 09:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.1.18/security/selinux/hooks.c linux-4.1.18-vs2.3.8.4/security/selinux/hooks.c
+--- linux-4.1.18/security/selinux/hooks.c 2016-02-18 18:02:02.000000000 +0000
++++ linux-4.1.18-vs2.3.8.4/security/selinux/hooks.c 2015-10-29 09:25:27.000000000 +0000
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff