-diff -NurpP --minimal linux-4.4.111/Documentation/vserver/debug.txt linux-4.4.111-vs2.3.9.5/Documentation/vserver/debug.txt
---- linux-4.4.111/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/Documentation/vserver/debug.txt linux-4.4.113-vs2.3.9.6/Documentation/vserver/debug.txt
+--- linux-4.4.113/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/Documentation/vserver/debug.txt 2018-01-09 16:36:20.000000000 +0000
@@ -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.4.111/arch/alpha/Kconfig linux-4.4.111-vs2.3.9.5/arch/alpha/Kconfig
---- linux-4.4.111/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/alpha/Kconfig linux-4.4.113-vs2.3.9.6/arch/alpha/Kconfig
+--- linux-4.4.113/arch/alpha/Kconfig 2016-07-05 04:11:34.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/alpha/Kconfig 2018-01-09 16:36:20.000000000 +0000
@@ -745,6 +745,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/alpha/kernel/systbls.S linux-4.4.111-vs2.3.9.5/arch/alpha/kernel/systbls.S
---- linux-4.4.111/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/systbls.S linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/systbls.S
+--- linux-4.4.113/arch/alpha/kernel/systbls.S 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/systbls.S 2018-01-09 16:36:20.000000000 +0000
@@ -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.4.111/arch/alpha/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/alpha/kernel/traps.c
---- linux-4.4.111/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/alpha/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/traps.c
+--- linux-4.4.113/arch/alpha/kernel/traps.c 2015-07-06 20:41:36.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/alpha/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
@@ -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.4.111/arch/arm/Kconfig linux-4.4.111-vs2.3.9.5/arch/arm/Kconfig
---- linux-4.4.111/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/arm/Kconfig linux-4.4.113-vs2.3.9.6/arch/arm/Kconfig
+--- linux-4.4.113/arch/arm/Kconfig 2016-07-05 04:14:23.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/arm/Kconfig 2018-01-09 16:36:20.000000000 +0000
@@ -2159,6 +2159,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/arm/kernel/calls.S linux-4.4.111-vs2.3.9.5/arch/arm/kernel/calls.S
---- linux-4.4.111/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/calls.S linux-4.4.113-vs2.3.9.6/arch/arm/kernel/calls.S
+--- linux-4.4.113/arch/arm/kernel/calls.S 2016-07-05 04:14:26.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/arm/kernel/calls.S 2018-01-09 16:36:20.000000000 +0000
@@ -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.4.111/arch/arm/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/arm/kernel/traps.c
---- linux-4.4.111/arch/arm/kernel/traps.c 2018-01-11 07:57:02.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/arm/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/arm/kernel/traps.c
+--- linux-4.4.113/arch/arm/kernel/traps.c 2018-01-24 21:22:09.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/arm/kernel/traps.c 2018-01-09 16:36:20.000000000 +0000
@@ -258,8 +258,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.4.111/arch/cris/Kconfig linux-4.4.111-vs2.3.9.5/arch/cris/Kconfig
---- linux-4.4.111/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/cris/Kconfig linux-4.4.113-vs2.3.9.6/arch/cris/Kconfig
+--- linux-4.4.113/arch/cris/Kconfig 2016-07-05 04:14:27.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/cris/Kconfig 2018-01-09 16:36:20.000000000 +0000
@@ -581,6 +581,8 @@ source "fs/Kconfig"
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/ia64/Kconfig linux-4.4.111-vs2.3.9.5/arch/ia64/Kconfig
---- linux-4.4.111/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/ia64/Kconfig linux-4.4.113-vs2.3.9.6/arch/ia64/Kconfig
+--- linux-4.4.113/arch/ia64/Kconfig 2016-07-05 04:11:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/ia64/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -606,6 +606,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/ia64/kernel/entry.S linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/entry.S
---- linux-4.4.111/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/entry.S linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/entry.S
+--- linux-4.4.113/arch/ia64/kernel/entry.S 2016-07-05 04:14:27.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/entry.S 2018-01-09 16:36:21.000000000 +0000
@@ -1694,7 +1694,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.4.111/arch/ia64/kernel/ptrace.c linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/ptrace.c
---- linux-4.4.111/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/ptrace.c
+--- linux-4.4.113/arch/ia64/kernel/ptrace.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/ia64/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/traps.c
---- linux-4.4.111/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/ia64/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/traps.c
+--- linux-4.4.113/arch/ia64/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/ia64/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
}
}
}
-diff -NurpP --minimal linux-4.4.111/arch/m32r/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/m32r/kernel/traps.c
---- linux-4.4.111/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/m32r/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/m32r/kernel/traps.c
+--- linux-4.4.113/arch/m32r/kernel/traps.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/m32r/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/m68k/Kconfig linux-4.4.111-vs2.3.9.5/arch/m68k/Kconfig
---- linux-4.4.111/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/m68k/Kconfig linux-4.4.113-vs2.3.9.6/arch/m68k/Kconfig
+--- linux-4.4.113/arch/m68k/Kconfig 2016-07-05 04:11:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/m68k/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -164,6 +164,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/mips/Kconfig linux-4.4.111-vs2.3.9.5/arch/mips/Kconfig
---- linux-4.4.111/arch/mips/Kconfig 2018-01-11 07:57:04.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/Kconfig linux-4.4.113-vs2.3.9.6/arch/mips/Kconfig
+--- linux-4.4.113/arch/mips/Kconfig 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -3026,6 +3026,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/mips/kernel/ptrace.c linux-4.4.111-vs2.3.9.5/arch/mips/kernel/ptrace.c
---- linux-4.4.111/arch/mips/kernel/ptrace.c 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/mips/kernel/ptrace.c
+--- linux-4.4.113/arch/mips/kernel/ptrace.c 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/ptrace.c 2018-01-25 00:25:00.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/audit.h>
#include <linux/seccomp.h>
#include <asm/byteorder.h>
#include <asm/cpu.h>
-@@ -690,6 +691,9 @@ long arch_ptrace(struct task_struct *chi
+@@ -787,6 +788,9 @@ long arch_ptrace(struct task_struct *chi
void __user *datavp = (void __user *) data;
unsigned long __user *datalp = (void __user *) data;
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-4.4.111/arch/mips/kernel/scall32-o32.S linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall32-o32.S
---- linux-4.4.111/arch/mips/kernel/scall32-o32.S 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall32-o32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall32-o32.S
+--- linux-4.4.113/arch/mips/kernel/scall32-o32.S 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall32-o32.S 2018-01-09 16:36:21.000000000 +0000
@@ -512,7 +512,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.4.111/arch/mips/kernel/scall64-64.S linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-64.S
---- linux-4.4.111/arch/mips/kernel/scall64-64.S 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-64.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-64.S
+--- linux-4.4.113/arch/mips/kernel/scall64-64.S 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-64.S 2018-01-09 16:36:21.000000000 +0000
@@ -349,7 +349,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.4.111/arch/mips/kernel/scall64-n32.S linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-n32.S
---- linux-4.4.111/arch/mips/kernel/scall64-n32.S 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-n32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-n32.S
+--- linux-4.4.113/arch/mips/kernel/scall64-n32.S 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-n32.S 2018-01-09 16:36:21.000000000 +0000
@@ -339,7 +339,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.4.111/arch/mips/kernel/scall64-o32.S linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-o32.S
---- linux-4.4.111/arch/mips/kernel/scall64-o32.S 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/scall64-o32.S linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-o32.S
+--- linux-4.4.113/arch/mips/kernel/scall64-o32.S 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/scall64-o32.S 2018-01-09 16:36:21.000000000 +0000
@@ -495,7 +495,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.4.111/arch/mips/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/mips/kernel/traps.c
---- linux-4.4.111/arch/mips/kernel/traps.c 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/mips/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/mips/kernel/traps.c
+--- linux-4.4.113/arch/mips/kernel/traps.c 2018-01-24 21:22:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/mips/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -353,9 +353,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-4.4.111/arch/parisc/Kconfig linux-4.4.111-vs2.3.9.5/arch/parisc/Kconfig
---- linux-4.4.111/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/parisc/Kconfig linux-4.4.113-vs2.3.9.6/arch/parisc/Kconfig
+--- linux-4.4.113/arch/parisc/Kconfig 2016-07-05 04:14:29.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/parisc/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -341,6 +341,8 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/parisc/kernel/syscall_table.S linux-4.4.111-vs2.3.9.5/arch/parisc/kernel/syscall_table.S
---- linux-4.4.111/arch/parisc/kernel/syscall_table.S 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/syscall_table.S linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/syscall_table.S
+--- linux-4.4.113/arch/parisc/kernel/syscall_table.S 2018-01-24 21:22:12.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/syscall_table.S 2018-01-09 16:36:21.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_COMP(keyctl)
-diff -NurpP --minimal linux-4.4.111/arch/parisc/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/parisc/kernel/traps.c
---- linux-4.4.111/arch/parisc/kernel/traps.c 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/parisc/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/traps.c
+--- linux-4.4.113/arch/parisc/kernel/traps.c 2018-01-24 21:22:12.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/parisc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/powerpc/Kconfig linux-4.4.111-vs2.3.9.5/arch/powerpc/Kconfig
---- linux-4.4.111/arch/powerpc/Kconfig 2018-01-11 07:57:05.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/powerpc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/powerpc/Kconfig linux-4.4.113-vs2.3.9.6/arch/powerpc/Kconfig
+--- linux-4.4.113/arch/powerpc/Kconfig 2018-01-24 21:22:12.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/powerpc/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -1080,6 +1080,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.111-vs2.3.9.5/arch/powerpc/include/uapi/asm/unistd.h
---- linux-4.4.111/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/powerpc/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-4.4.113/arch/powerpc/include/uapi/asm/unistd.h 2016-07-05 04:14:29.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/powerpc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/powerpc/kernel/traps.c linux-4.4.111-vs2.3.9.5/arch/powerpc/kernel/traps.c
---- linux-4.4.111/arch/powerpc/kernel/traps.c 2018-01-11 07:57:06.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/powerpc/kernel/traps.c linux-4.4.113-vs2.3.9.6/arch/powerpc/kernel/traps.c
+--- linux-4.4.113/arch/powerpc/kernel/traps.c 2018-01-24 21:22:12.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/powerpc/kernel/traps.c 2018-01-09 16:36:21.000000000 +0000
@@ -1315,8 +1315,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.4.111/arch/s390/Kconfig linux-4.4.111-vs2.3.9.5/arch/s390/Kconfig
---- linux-4.4.111/arch/s390/Kconfig 2018-01-11 07:57:06.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/s390/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/s390/Kconfig linux-4.4.113-vs2.3.9.6/arch/s390/Kconfig
+--- linux-4.4.113/arch/s390/Kconfig 2018-01-24 21:22:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/s390/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -729,6 +729,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/s390/include/asm/tlb.h linux-4.4.111-vs2.3.9.5/arch/s390/include/asm/tlb.h
---- linux-4.4.111/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/s390/include/asm/tlb.h linux-4.4.113-vs2.3.9.6/arch/s390/include/asm/tlb.h
+--- linux-4.4.113/arch/s390/include/asm/tlb.h 2015-07-06 20:41:37.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/s390/include/asm/tlb.h 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/s390/include/uapi/asm/unistd.h linux-4.4.111-vs2.3.9.5/arch/s390/include/uapi/asm/unistd.h
---- linux-4.4.111/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/s390/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/s390/include/uapi/asm/unistd.h
+--- linux-4.4.113/arch/s390/include/uapi/asm/unistd.h 2016-07-05 04:14:30.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/s390/include/uapi/asm/unistd.h 2018-01-09 16:48:33.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime 260
#define __NR_clock_getres 261
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-4.4.111/arch/s390/kernel/ptrace.c linux-4.4.111-vs2.3.9.5/arch/s390/kernel/ptrace.c
---- linux-4.4.111/arch/s390/kernel/ptrace.c 2018-01-11 07:57:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/arch/s390/kernel/ptrace.c
+--- linux-4.4.113/arch/s390/kernel/ptrace.c 2018-01-24 21:22:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/s390/kernel/ptrace.c 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/s390/kernel/syscalls.S linux-4.4.111-vs2.3.9.5/arch/s390/kernel/syscalls.S
---- linux-4.4.111/arch/s390/kernel/syscalls.S 2018-01-11 07:57:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/s390/kernel/syscalls.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/s390/kernel/syscalls.S linux-4.4.113-vs2.3.9.6/arch/s390/kernel/syscalls.S
+--- linux-4.4.113/arch/s390/kernel/syscalls.S 2018-01-24 21:22:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/s390/kernel/syscalls.S 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/sh/Kconfig linux-4.4.111-vs2.3.9.5/arch/sh/Kconfig
---- linux-4.4.111/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sh/Kconfig linux-4.4.113-vs2.3.9.6/arch/sh/Kconfig
+--- linux-4.4.113/arch/sh/Kconfig 2016-07-05 04:11:46.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sh/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -883,6 +883,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/sh/kernel/irq.c linux-4.4.111-vs2.3.9.5/arch/sh/kernel/irq.c
---- linux-4.4.111/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sh/kernel/irq.c linux-4.4.113-vs2.3.9.6/arch/sh/kernel/irq.c
+--- linux-4.4.113/arch/sh/kernel/irq.c 2016-07-05 04:11:46.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sh/kernel/irq.c 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/sparc/Kconfig linux-4.4.111-vs2.3.9.5/arch/sparc/Kconfig
---- linux-4.4.111/arch/sparc/Kconfig 2018-01-11 07:57:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sparc/Kconfig linux-4.4.113-vs2.3.9.6/arch/sparc/Kconfig
+--- linux-4.4.113/arch/sparc/Kconfig 2018-01-24 21:22:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sparc/Kconfig 2018-01-09 16:36:21.000000000 +0000
@@ -561,6 +561,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/sparc/include/uapi/asm/unistd.h linux-4.4.111-vs2.3.9.5/arch/sparc/include/uapi/asm/unistd.h
---- linux-4.4.111/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sparc/include/uapi/asm/unistd.h linux-4.4.113-vs2.3.9.6/arch/sparc/include/uapi/asm/unistd.h
+--- linux-4.4.113/arch/sparc/include/uapi/asm/unistd.h 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sparc/include/uapi/asm/unistd.h 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/sparc/kernel/systbls_32.S linux-4.4.111-vs2.3.9.5/arch/sparc/kernel/systbls_32.S
---- linux-4.4.111/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sparc/kernel/systbls_32.S linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_32.S
+--- linux-4.4.113/arch/sparc/kernel/systbls_32.S 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_32.S 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/sparc/kernel/systbls_64.S linux-4.4.111-vs2.3.9.5/arch/sparc/kernel/systbls_64.S
---- linux-4.4.111/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/sparc/kernel/systbls_64.S linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_64.S
+--- linux-4.4.113/arch/sparc/kernel/systbls_64.S 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/sparc/kernel/systbls_64.S 2018-01-09 16:36:21.000000000 +0000
@@ -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.4.111/arch/um/Kconfig.rest linux-4.4.111-vs2.3.9.5/arch/um/Kconfig.rest
---- linux-4.4.111/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/um/Kconfig.rest linux-4.4.113-vs2.3.9.6/arch/um/Kconfig.rest
+--- linux-4.4.113/arch/um/Kconfig.rest 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/um/Kconfig.rest 2018-01-09 16:36:21.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/x86/Kconfig linux-4.4.111-vs2.3.9.5/arch/x86/Kconfig
---- linux-4.4.111/arch/x86/Kconfig 2018-01-11 07:57:08.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/x86/Kconfig 2018-01-09 16:36:21.000000000 +0000
-@@ -2672,6 +2672,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-4.4.113/arch/x86/Kconfig linux-4.4.113-vs2.3.9.6/arch/x86/Kconfig
+--- linux-4.4.113/arch/x86/Kconfig 2018-01-24 21:22:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/x86/Kconfig 2018-01-25 00:25:00.000000000 +0000
+@@ -2686,6 +2686,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-4.4.111/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.111-vs2.3.9.5/arch/x86/entry/syscalls/syscall_32.tbl
---- linux-4.4.111/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-11 07:57:08.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/x86/entry/syscalls/syscall_32.tbl linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_32.tbl
+--- linux-4.4.113/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-24 21:22:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_32.tbl 2018-01-10 01:51:14.000000000 +0000
@@ -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.4.111/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.111-vs2.3.9.5/arch/x86/entry/syscalls/syscall_64.tbl
---- linux-4.4.111/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/arch/x86/entry/syscalls/syscall_64.tbl linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_64.tbl
+--- linux-4.4.113/arch/x86/entry/syscalls/syscall_64.tbl 2016-07-05 04:14:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/arch/x86/entry/syscalls/syscall_64.tbl 2018-01-10 01:51:32.000000000 +0000
@@ -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.4.111/block/ioprio.c linux-4.4.111-vs2.3.9.5/block/ioprio.c
---- linux-4.4.111/block/ioprio.c 2018-01-11 07:57:12.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/block/ioprio.c linux-4.4.113-vs2.3.9.6/block/ioprio.c
+--- linux-4.4.113/block/ioprio.c 2018-01-24 21:22:16.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/block/ioprio.c 2018-01-09 16:36:23.000000000 +0000
@@ -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.4.111/drivers/block/Kconfig linux-4.4.111-vs2.3.9.5/drivers/block/Kconfig
---- linux-4.4.111/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/block/Kconfig linux-4.4.113-vs2.3.9.6/drivers/block/Kconfig
+--- linux-4.4.113/drivers/block/Kconfig 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/block/Kconfig 2018-01-09 16:36:23.000000000 +0000
@@ -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.4.111/drivers/block/Makefile linux-4.4.111-vs2.3.9.5/drivers/block/Makefile
---- linux-4.4.111/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/block/Makefile 2018-01-09 16:36:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/block/Makefile linux-4.4.113-vs2.3.9.6/drivers/block/Makefile
+--- linux-4.4.113/drivers/block/Makefile 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/block/Makefile 2018-01-09 16:36:23.000000000 +0000
@@ -32,6 +32,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.4.111/drivers/block/loop.c linux-4.4.111-vs2.3.9.5/drivers/block/loop.c
---- linux-4.4.111/drivers/block/loop.c 2018-01-11 07:57:13.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/block/loop.c 2018-01-09 23:00:25.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/block/loop.c linux-4.4.113-vs2.3.9.6/drivers/block/loop.c
+--- linux-4.4.113/drivers/block/loop.c 2018-01-24 21:22:21.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/block/loop.c 2018-01-09 23:00:25.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/miscdevice.h>
#include <linux/falloc.h>
atomic_inc(&lo->lo_refcnt);
out:
mutex_unlock(&loop_index_mutex);
-diff -NurpP --minimal linux-4.4.111/drivers/block/loop.h linux-4.4.111-vs2.3.9.5/drivers/block/loop.h
---- linux-4.4.111/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/block/loop.h linux-4.4.113-vs2.3.9.6/drivers/block/loop.h
+--- linux-4.4.113/drivers/block/loop.h 2016-07-05 04:14:35.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/block/loop.h 2018-01-09 16:36:23.000000000 +0000
@@ -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.4.111/drivers/block/vroot.c linux-4.4.111-vs2.3.9.5/drivers/block/vroot.c
---- linux-4.4.111/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/block/vroot.c 2018-01-11 07:37:22.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/block/vroot.c linux-4.4.113-vs2.3.9.6/drivers/block/vroot.c
+--- linux-4.4.113/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/block/vroot.c 2018-01-11 07:37:22.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * 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.4.111/drivers/infiniband/core/addr.c linux-4.4.111-vs2.3.9.5/drivers/infiniband/core/addr.c
---- linux-4.4.111/drivers/infiniband/core/addr.c 2018-01-11 07:57:21.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/infiniband/core/addr.c linux-4.4.113-vs2.3.9.6/drivers/infiniband/core/addr.c
+--- linux-4.4.113/drivers/infiniband/core/addr.c 2018-01-24 21:22:30.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/infiniband/core/addr.c 2018-01-09 16:49:06.000000000 +0000
@@ -283,7 +283,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
if (ret)
goto put;
-diff -NurpP --minimal linux-4.4.111/drivers/md/dm-ioctl.c linux-4.4.111-vs2.3.9.5/drivers/md/dm-ioctl.c
---- linux-4.4.111/drivers/md/dm-ioctl.c 2018-01-11 07:57:23.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/md/dm-ioctl.c linux-4.4.113-vs2.3.9.6/drivers/md/dm-ioctl.c
+--- linux-4.4.113/drivers/md/dm-ioctl.c 2018-01-24 21:22:32.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/md/dm-ioctl.c 2018-01-09 16:36:23.000000000 +0000
@@ -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.4.111/drivers/md/dm.c linux-4.4.111-vs2.3.9.5/drivers/md/dm.c
---- linux-4.4.111/drivers/md/dm.c 2018-01-11 07:57:23.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/md/dm.c 2018-01-09 16:49:30.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/md/dm.c linux-4.4.113-vs2.3.9.6/drivers/md/dm.c
+--- linux-4.4.113/drivers/md/dm.c 2018-01-24 21:22:32.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/md/dm.c 2018-01-09 16:49:30.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/elevator.h> /* for rq_end_sector() */
#include <linux/blk-mq.h>
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad;
-diff -NurpP --minimal linux-4.4.111/drivers/md/dm.h linux-4.4.111-vs2.3.9.5/drivers/md/dm.h
---- linux-4.4.111/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/md/dm.h linux-4.4.113-vs2.3.9.6/drivers/md/dm.h
+--- linux-4.4.113/drivers/md/dm.h 2016-07-05 04:12:06.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/md/dm.h 2018-01-09 16:36:24.000000000 +0000
@@ -52,6 +52,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-4.4.111/drivers/net/tun.c linux-4.4.111-vs2.3.9.5/drivers/net/tun.c
---- linux-4.4.111/drivers/net/tun.c 2018-01-11 07:57:30.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/net/tun.c linux-4.4.113-vs2.3.9.6/drivers/net/tun.c
+--- linux-4.4.113/drivers/net/tun.c 2018-01-24 21:22:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/net/tun.c 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.111-vs2.3.9.5/drivers/scsi/cxgbi/libcxgbi.c
---- linux-4.4.111/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/scsi/cxgbi/libcxgbi.c linux-4.4.113-vs2.3.9.6/drivers/scsi/cxgbi/libcxgbi.c
+--- linux-4.4.113/drivers/scsi/cxgbi/libcxgbi.c 2015-10-29 09:21:24.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/scsi/cxgbi/libcxgbi.c 2018-01-09 16:36:24.000000000 +0000
@@ -768,7 +768,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.4.111/drivers/tty/sysrq.c linux-4.4.111-vs2.3.9.5/drivers/tty/sysrq.c
---- linux-4.4.111/drivers/tty/sysrq.c 2018-01-11 07:57:38.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/tty/sysrq.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/tty/sysrq.c linux-4.4.113-vs2.3.9.6/drivers/tty/sysrq.c
+--- linux-4.4.113/drivers/tty/sysrq.c 2018-01-24 21:22:49.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/tty/sysrq.c 2018-01-25 00:25:02.000000000 +0000
@@ -47,6 +47,7 @@
#include <linux/syscalls.h>
#include <linux/of.h>
#include <asm/ptrace.h>
#include <asm/irq_regs.h>
-@@ -421,6 +422,21 @@ static struct sysrq_key_op sysrq_unrt_op
+@@ -427,6 +428,21 @@ static struct sysrq_key_op sysrq_unrt_op
.enable_mask = SYSRQ_ENABLE_RTNICE,
};
/* Key Operations table and lock */
static DEFINE_SPINLOCK(sysrq_key_table_lock);
-@@ -477,7 +493,11 @@ static struct sysrq_key_op *sysrq_key_ta
+@@ -483,7 +499,11 @@ static struct sysrq_key_op *sysrq_key_ta
/* x: May be registered on mips for TLB dump */
/* x: May be registered on ppc/powerpc for xmon */
/* x: May be registered on sparc64 for global PMU dump */
/* y: May be registered on sparc64 for global register dump */
NULL, /* y */
&sysrq_ftrace_dump_op, /* z */
-@@ -492,6 +512,8 @@ static int sysrq_key_table_key2index(int
+@@ -498,6 +518,8 @@ static int sysrq_key_table_key2index(int
retval = key - '0';
else if ((key >= 'a') && (key <= 'z'))
retval = key + 10 - 'a';
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-4.4.111/drivers/tty/tty_io.c linux-4.4.111-vs2.3.9.5/drivers/tty/tty_io.c
---- linux-4.4.111/drivers/tty/tty_io.c 2018-01-11 07:57:38.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/drivers/tty/tty_io.c linux-4.4.113-vs2.3.9.6/drivers/tty/tty_io.c
+--- linux-4.4.113/drivers/tty/tty_io.c 2018-01-24 21:22:49.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/drivers/tty/tty_io.c 2018-01-09 16:36:24.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-4.4.111/fs/attr.c linux-4.4.111-vs2.3.9.5/fs/attr.c
---- linux-4.4.111/fs/attr.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/attr.c 2018-01-09 17:27:12.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/attr.c linux-4.4.113-vs2.3.9.6/fs/attr.c
+--- linux-4.4.113/fs/attr.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/attr.c 2018-01-09 17:27:12.000000000 +0000
@@ -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.4.111/fs/block_dev.c linux-4.4.111-vs2.3.9.5/fs/block_dev.c
---- linux-4.4.111/fs/block_dev.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/block_dev.c linux-4.4.113-vs2.3.9.6/fs/block_dev.c
+--- linux-4.4.113/fs/block_dev.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/block_dev.c 2018-01-09 17:16:29.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-4.4.111/fs/btrfs/ctree.h linux-4.4.111-vs2.3.9.5/fs/btrfs/ctree.h
---- linux-4.4.111/fs/btrfs/ctree.h 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/btrfs/ctree.h linux-4.4.113-vs2.3.9.6/fs/btrfs/ctree.h
+--- linux-4.4.113/fs/btrfs/ctree.h 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/btrfs/ctree.h 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/btrfs/disk-io.c linux-4.4.111-vs2.3.9.5/fs/btrfs/disk-io.c
---- linux-4.4.111/fs/btrfs/disk-io.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/btrfs/disk-io.c linux-4.4.113-vs2.3.9.6/fs/btrfs/disk-io.c
+--- linux-4.4.113/fs/btrfs/disk-io.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/btrfs/disk-io.c 2018-01-09 16:36:24.000000000 +0000
@@ -2736,6 +2736,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.4.111/fs/btrfs/inode.c linux-4.4.111-vs2.3.9.5/fs/btrfs/inode.c
---- linux-4.4.111/fs/btrfs/inode.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/btrfs/inode.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/btrfs/inode.c linux-4.4.113-vs2.3.9.6/fs/btrfs/inode.c
+--- linux-4.4.113/fs/btrfs/inode.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/btrfs/inode.c 2018-01-09 16:36:24.000000000 +0000
@@ -43,6 +43,7 @@
#include <linux/blkdev.h>
#include <linux/posix_acl_xattr.h>
.get_acl = btrfs_get_acl,
.set_acl = btrfs_set_acl,
.update_time = btrfs_update_time,
-diff -NurpP --minimal linux-4.4.111/fs/btrfs/ioctl.c linux-4.4.111-vs2.3.9.5/fs/btrfs/ioctl.c
---- linux-4.4.111/fs/btrfs/ioctl.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/btrfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/btrfs/ioctl.c
+--- linux-4.4.113/fs/btrfs/ioctl.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/btrfs/ioctl.c 2018-01-09 16:36:24.000000000 +0000
@@ -108,10 +108,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.4.111/fs/btrfs/super.c linux-4.4.111-vs2.3.9.5/fs/btrfs/super.c
---- linux-4.4.111/fs/btrfs/super.c 2018-01-11 07:57:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/btrfs/super.c linux-4.4.113-vs2.3.9.6/fs/btrfs/super.c
+--- linux-4.4.113/fs/btrfs/super.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/btrfs/super.c 2018-01-09 17:25:27.000000000 +0000
@@ -306,7 +306,7 @@ enum {
#ifdef CONFIG_BTRFS_DEBUG
Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all,
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-4.4.111/fs/char_dev.c linux-4.4.111-vs2.3.9.5/fs/char_dev.c
---- linux-4.4.111/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/char_dev.c linux-4.4.113-vs2.3.9.6/fs/char_dev.c
+--- linux-4.4.113/fs/char_dev.c 2016-07-05 04:12:30.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/char_dev.c 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/dcache.c linux-4.4.111-vs2.3.9.5/fs/dcache.c
---- linux-4.4.111/fs/dcache.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/dcache.c linux-4.4.113-vs2.3.9.6/fs/dcache.c
+--- linux-4.4.113/fs/dcache.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/dcache.c 2018-01-09 16:36:24.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/ratelimit.h>
#include <linux/list_lru.h>
}
}
return D_WALK_CONTINUE;
-diff -NurpP --minimal linux-4.4.111/fs/devpts/inode.c linux-4.4.111-vs2.3.9.5/fs/devpts/inode.c
---- linux-4.4.111/fs/devpts/inode.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/devpts/inode.c linux-4.4.113-vs2.3.9.6/fs/devpts/inode.c
+--- linux-4.4.113/fs/devpts/inode.c 2018-01-24 21:22:51.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/devpts/inode.c 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/ext2/balloc.c linux-4.4.111-vs2.3.9.5/fs/ext2/balloc.c
---- linux-4.4.111/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/balloc.c linux-4.4.113-vs2.3.9.6/fs/ext2/balloc.c
+--- linux-4.4.113/fs/ext2/balloc.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/balloc.c 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/ext2/ext2.h linux-4.4.111-vs2.3.9.5/fs/ext2/ext2.h
---- linux-4.4.111/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/ext2.h 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/ext2.h linux-4.4.113-vs2.3.9.6/fs/ext2/ext2.h
+--- linux-4.4.113/fs/ext2/ext2.h 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/ext2.h 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/ext2/file.c linux-4.4.111-vs2.3.9.5/fs/ext2/file.c
---- linux-4.4.111/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/file.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/file.c linux-4.4.113-vs2.3.9.6/fs/ext2/file.c
+--- linux-4.4.113/fs/ext2/file.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/file.c 2018-01-09 16:36:24.000000000 +0000
@@ -202,4 +202,5 @@ const struct inode_operations ext2_file_
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-4.4.111/fs/ext2/ialloc.c linux-4.4.111-vs2.3.9.5/fs/ext2/ialloc.c
---- linux-4.4.111/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ext2/ialloc.c
+--- linux-4.4.113/fs/ext2/ialloc.c 2016-07-05 04:12:30.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/ialloc.c 2018-01-09 16:36:24.000000000 +0000
@@ -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.4.111/fs/ext2/inode.c linux-4.4.111-vs2.3.9.5/fs/ext2/inode.c
---- linux-4.4.111/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/inode.c linux-4.4.113-vs2.3.9.6/fs/ext2/inode.c
+--- linux-4.4.113/fs/ext2/inode.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/inode.c 2018-01-09 16:36:24.000000000 +0000
@@ -33,6 +33,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-4.4.111/fs/ext2/ioctl.c linux-4.4.111-vs2.3.9.5/fs/ext2/ioctl.c
---- linux-4.4.111/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ext2/ioctl.c
+--- linux-4.4.113/fs/ext2/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/ioctl.c 2018-01-09 16:36:24.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-4.4.111/fs/ext2/namei.c linux-4.4.111-vs2.3.9.5/fs/ext2/namei.c
---- linux-4.4.111/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/namei.c linux-4.4.113-vs2.3.9.6/fs/ext2/namei.c
+--- linux-4.4.113/fs/ext2/namei.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/namei.c 2018-01-09 16:36:24.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
.get_acl = ext2_get_acl,
.set_acl = ext2_set_acl,
};
-diff -NurpP --minimal linux-4.4.111/fs/ext2/super.c linux-4.4.111-vs2.3.9.5/fs/ext2/super.c
---- linux-4.4.111/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext2/super.c linux-4.4.113-vs2.3.9.6/fs/ext2/super.c
+--- linux-4.4.113/fs/ext2/super.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext2/super.c 2018-01-09 16:36:24.000000000 +0000
@@ -408,7 +408,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.4.111/fs/ext4/ext4.h linux-4.4.111-vs2.3.9.5/fs/ext4/ext4.h
---- linux-4.4.111/fs/ext4/ext4.h 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/ext4.h linux-4.4.113-vs2.3.9.6/fs/ext4/ext4.h
+--- linux-4.4.113/fs/ext4/ext4.h 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/ext4.h 2018-01-09 17:33:10.000000000 +0000
@@ -375,8 +375,11 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
extern int ext4_alloc_da_blocks(struct inode *inode);
extern void ext4_set_aops(struct inode *inode);
extern int ext4_writepage_trans_blocks(struct inode *);
-diff -NurpP --minimal linux-4.4.111/fs/ext4/file.c linux-4.4.111-vs2.3.9.5/fs/ext4/file.c
---- linux-4.4.111/fs/ext4/file.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/file.c linux-4.4.113-vs2.3.9.6/fs/ext4/file.c
+--- linux-4.4.113/fs/ext4/file.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/file.c 2018-01-09 16:36:31.000000000 +0000
@@ -749,5 +749,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.4.111/fs/ext4/ialloc.c linux-4.4.111-vs2.3.9.5/fs/ext4/ialloc.c
---- linux-4.4.111/fs/ext4/ialloc.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/ialloc.c linux-4.4.113-vs2.3.9.6/fs/ext4/ialloc.c
+--- linux-4.4.113/fs/ext4/ialloc.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/ialloc.c 2018-01-09 16:36:31.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
} else
inode_init_owner(inode, dir, mode);
err = dquot_initialize(inode);
-diff -NurpP --minimal linux-4.4.111/fs/ext4/inode.c linux-4.4.111-vs2.3.9.5/fs/ext4/inode.c
---- linux-4.4.111/fs/ext4/inode.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/inode.c 2018-01-09 16:36:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/inode.c linux-4.4.113-vs2.3.9.6/fs/ext4/inode.c
+--- linux-4.4.113/fs/ext4/inode.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/inode.c 2018-01-09 16:36:31.000000000 +0000
@@ -37,6 +37,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.4.111/fs/ext4/ioctl.c linux-4.4.111-vs2.3.9.5/fs/ext4/ioctl.c
---- linux-4.4.111/fs/ext4/ioctl.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ext4/ioctl.c
+--- linux-4.4.113/fs/ext4/ioctl.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/ioctl.c 2018-01-09 16:36:31.000000000 +0000
@@ -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.4.111/fs/ext4/namei.c linux-4.4.111-vs2.3.9.5/fs/ext4/namei.c
---- linux-4.4.111/fs/ext4/namei.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/namei.c 2018-01-09 16:36:31.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/namei.c linux-4.4.113-vs2.3.9.6/fs/ext4/namei.c
+--- linux-4.4.113/fs/ext4/namei.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/namei.c 2018-01-09 16:36:31.000000000 +0000
@@ -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.4.111/fs/ext4/super.c linux-4.4.111-vs2.3.9.5/fs/ext4/super.c
---- linux-4.4.111/fs/ext4/super.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ext4/super.c linux-4.4.113-vs2.3.9.6/fs/ext4/super.c
+--- linux-4.4.113/fs/ext4/super.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ext4/super.c 2018-01-09 16:36:32.000000000 +0000
@@ -1165,6 +1165,7 @@ enum {
Opt_dioread_nolock, Opt_dioread_lock,
Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-4.4.111/fs/fcntl.c linux-4.4.111-vs2.3.9.5/fs/fcntl.c
---- linux-4.4.111/fs/fcntl.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/fcntl.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/fcntl.c linux-4.4.113-vs2.3.9.6/fs/fcntl.c
+--- linux-4.4.113/fs/fcntl.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/fcntl.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/file.c linux-4.4.111-vs2.3.9.5/fs/file.c
---- linux-4.4.111/fs/file.c 2016-07-05 04:15:07.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/file.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/file.c linux-4.4.113-vs2.3.9.6/fs/file.c
+--- linux-4.4.113/fs/file.c 2016-07-05 04:15:07.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/file.c 2018-01-09 16:36:32.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
return fd;
-diff -NurpP --minimal linux-4.4.111/fs/file_table.c linux-4.4.111-vs2.3.9.5/fs/file_table.c
---- linux-4.4.111/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/file_table.c linux-4.4.113-vs2.3.9.6/fs/file_table.c
+--- linux-4.4.113/fs/file_table.c 2015-10-29 09:21:35.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/file_table.c 2018-01-09 17:25:51.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/task_work.h>
#include <linux/ima.h>
file_free(file);
}
}
-diff -NurpP --minimal linux-4.4.111/fs/fs_struct.c linux-4.4.111-vs2.3.9.5/fs/fs_struct.c
---- linux-4.4.111/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/fs_struct.c linux-4.4.113-vs2.3.9.6/fs/fs_struct.c
+--- linux-4.4.113/fs/fs_struct.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/fs_struct.c 2018-01-09 16:36:32.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
}
return fs;
}
-diff -NurpP --minimal linux-4.4.111/fs/gfs2/file.c linux-4.4.111-vs2.3.9.5/fs/gfs2/file.c
---- linux-4.4.111/fs/gfs2/file.c 2018-01-11 07:57:44.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/gfs2/file.c linux-4.4.113-vs2.3.9.6/fs/gfs2/file.c
+--- linux-4.4.113/fs/gfs2/file.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/gfs2/file.c 2018-01-09 17:23:53.000000000 +0000
@@ -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.4.111/fs/gfs2/inode.h linux-4.4.111-vs2.3.9.5/fs/gfs2/inode.h
---- linux-4.4.111/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/gfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/gfs2/inode.h
+--- linux-4.4.113/fs/gfs2/inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/gfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/hostfs/hostfs.h linux-4.4.111-vs2.3.9.5/fs/hostfs/hostfs.h
---- linux-4.4.111/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/hostfs/hostfs.h linux-4.4.113-vs2.3.9.6/fs/hostfs/hostfs.h
+--- linux-4.4.113/fs/hostfs/hostfs.h 2015-07-06 20:41:42.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/hostfs/hostfs.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/inode.c linux-4.4.111-vs2.3.9.5/fs/inode.c
---- linux-4.4.111/fs/inode.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/inode.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/inode.c linux-4.4.113-vs2.3.9.6/fs/inode.c
+--- linux-4.4.113/fs/inode.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ioctl.c linux-4.4.111-vs2.3.9.5/fs/ioctl.c
---- linux-4.4.111/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ioctl.c
+--- linux-4.4.113/fs/ioctl.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-4.4.111/fs/jfs/file.c linux-4.4.111-vs2.3.9.5/fs/jfs/file.c
---- linux-4.4.111/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/file.c linux-4.4.113-vs2.3.9.6/fs/jfs/file.c
+--- linux-4.4.113/fs/jfs/file.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/file.c 2018-01-09 16:36:32.000000000 +0000
@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
}
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-4.4.111/fs/jfs/ioctl.c linux-4.4.111-vs2.3.9.5/fs/jfs/ioctl.c
---- linux-4.4.111/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/ioctl.c linux-4.4.113-vs2.3.9.6/fs/jfs/ioctl.c
+--- linux-4.4.113/fs/jfs/ioctl.c 2015-10-29 09:21:36.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/jfs/jfs_dinode.h linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_dinode.h
---- linux-4.4.111/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_dinode.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_dinode.h
+--- linux-4.4.113/fs/jfs/jfs_dinode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_dinode.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/jfs/jfs_filsys.h linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_filsys.h
---- linux-4.4.111/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_filsys.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_filsys.h
+--- linux-4.4.113/fs/jfs/jfs_filsys.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_filsys.h 2018-01-09 16:36:32.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-4.4.111/fs/jfs/jfs_imap.c linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_imap.c
---- linux-4.4.111/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_imap.c linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_imap.c
+--- linux-4.4.113/fs/jfs/jfs_imap.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_imap.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/jfs/jfs_inode.c linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_inode.c
---- linux-4.4.111/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_inode.c 2018-01-14 06:39:51.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.c linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.c
+--- linux-4.4.113/fs/jfs/jfs_inode.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.c 2018-01-14 06:39:51.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
}
/*
-diff -NurpP --minimal linux-4.4.111/fs/jfs/jfs_inode.h linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_inode.h
---- linux-4.4.111/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/jfs_inode.h linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.h
+--- linux-4.4.113/fs/jfs/jfs_inode.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/jfs_inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/jfs/namei.c linux-4.4.111-vs2.3.9.5/fs/jfs/namei.c
---- linux-4.4.111/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/namei.c linux-4.4.113-vs2.3.9.6/fs/jfs/namei.c
+--- linux-4.4.113/fs/jfs/namei.c 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/namei.c 2018-01-09 16:36:32.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-4.4.111/fs/jfs/super.c linux-4.4.111-vs2.3.9.5/fs/jfs/super.c
---- linux-4.4.111/fs/jfs/super.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/jfs/super.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/jfs/super.c linux-4.4.113-vs2.3.9.6/fs/jfs/super.c
+--- linux-4.4.113/fs/jfs/super.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/jfs/super.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/libfs.c linux-4.4.111-vs2.3.9.5/fs/libfs.c
---- linux-4.4.111/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/libfs.c linux-4.4.113-vs2.3.9.6/fs/libfs.c
+--- linux-4.4.113/fs/libfs.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/libfs.c 2018-01-09 16:36:32.000000000 +0000
@@ -141,13 +141,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.4.111/fs/locks.c linux-4.4.111-vs2.3.9.5/fs/locks.c
---- linux-4.4.111/fs/locks.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/locks.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/locks.c linux-4.4.113-vs2.3.9.6/fs/locks.c
+--- linux-4.4.113/fs/locks.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/locks.c 2018-01-25 00:25:02.000000000 +0000
@@ -129,6 +129,8 @@
#include <linux/hashtable.h>
#include <linux/percpu.h>
/*
* This might block, so we do it before checking the inode.
*/
-@@ -2307,6 +2341,11 @@ int fcntl_setlk64(unsigned int fd, struc
+@@ -2309,6 +2343,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.
*/
-@@ -2620,8 +2659,11 @@ static int locks_show(struct seq_file *f
+@@ -2624,8 +2663,11 @@ static int locks_show(struct seq_file *f
lock_get_status(f, fl, iter->li_pos, "");
return 0;
}
-diff -NurpP --minimal linux-4.4.111/fs/mount.h linux-4.4.111-vs2.3.9.5/fs/mount.h
---- linux-4.4.111/fs/mount.h 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/mount.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/mount.h linux-4.4.113-vs2.3.9.6/fs/mount.h
+--- linux-4.4.113/fs/mount.h 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/mount.h 2018-01-09 16:36:32.000000000 +0000
@@ -68,6 +68,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.4.111/fs/namei.c linux-4.4.111-vs2.3.9.5/fs/namei.c
---- linux-4.4.111/fs/namei.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/namei.c 2018-01-13 03:11:55.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/namei.c linux-4.4.113-vs2.3.9.6/fs/namei.c
+--- linux-4.4.113/fs/namei.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/namei.c 2018-01-13 03:11:55.000000000 +0000
@@ -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.4.111/fs/namespace.c linux-4.4.111-vs2.3.9.5/fs/namespace.c
---- linux-4.4.111/fs/namespace.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/namespace.c linux-4.4.113-vs2.3.9.6/fs/namespace.c
+--- linux-4.4.113/fs/namespace.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/namespace.c 2018-01-09 16:36:32.000000000 +0000
@@ -24,6 +24,11 @@
#include <linux/magic.h>
#include <linux/bootmem.h>
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-4.4.111/fs/nfs/client.c linux-4.4.111-vs2.3.9.5/fs/nfs/client.c
---- linux-4.4.111/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfs/client.c linux-4.4.113-vs2.3.9.6/fs/nfs/client.c
+--- linux-4.4.113/fs/nfs/client.c 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfs/client.c 2018-01-09 16:36:32.000000000 +0000
@@ -583,6 +583,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.4.111/fs/nfs/dir.c linux-4.4.111-vs2.3.9.5/fs/nfs/dir.c
---- linux-4.4.111/fs/nfs/dir.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfs/dir.c linux-4.4.113-vs2.3.9.6/fs/nfs/dir.c
+--- linux-4.4.113/fs/nfs/dir.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfs/dir.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/nfs/inode.c linux-4.4.111-vs2.3.9.5/fs/nfs/inode.c
---- linux-4.4.111/fs/nfs/inode.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfs/inode.c linux-4.4.113-vs2.3.9.6/fs/nfs/inode.c
+--- linux-4.4.113/fs/nfs/inode.c 2018-01-24 21:22:52.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfs/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-4.4.111/fs/nfs/nfs3xdr.c linux-4.4.111-vs2.3.9.5/fs/nfs/nfs3xdr.c
---- linux-4.4.111/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfs/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs/nfs/nfs3xdr.c
+--- linux-4.4.113/fs/nfs/nfs3xdr.c 2016-07-05 04:12:33.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfs/nfs3xdr.c 2018-01-09 17:17:07.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
}
/*
-diff -NurpP --minimal linux-4.4.111/fs/nfs/super.c linux-4.4.111-vs2.3.9.5/fs/nfs/super.c
---- linux-4.4.111/fs/nfs/super.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfs/super.c linux-4.4.113-vs2.3.9.6/fs/nfs/super.c
+--- linux-4.4.113/fs/nfs/super.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfs/super.c 2018-01-09 16:36:32.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
/*
* options that take text values
-diff -NurpP --minimal linux-4.4.111/fs/nfsd/auth.c linux-4.4.111-vs2.3.9.5/fs/nfsd/auth.c
---- linux-4.4.111/fs/nfsd/auth.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfsd/auth.c 2018-01-11 08:03:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfsd/auth.c linux-4.4.113-vs2.3.9.6/fs/nfsd/auth.c
+--- linux-4.4.113/fs/nfsd/auth.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfsd/auth.c 2018-01-11 08:03:00.000000000 +0000
@@ -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.4.111/fs/nfsd/nfs3xdr.c linux-4.4.111-vs2.3.9.5/fs/nfsd/nfs3xdr.c
---- linux-4.4.111/fs/nfsd/nfs3xdr.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs3xdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs3xdr.c
+--- linux-4.4.113/fs/nfsd/nfs3xdr.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs3xdr.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/nfsd/nfs4xdr.c linux-4.4.111-vs2.3.9.5/fs/nfsd/nfs4xdr.c
---- linux-4.4.111/fs/nfsd/nfs4xdr.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfs4xdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs4xdr.c
+--- linux-4.4.113/fs/nfsd/nfs4xdr.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfs4xdr.c 2018-01-09 16:36:32.000000000 +0000
@@ -40,6 +40,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
if (status)
goto out;
}
-diff -NurpP --minimal linux-4.4.111/fs/nfsd/nfsxdr.c linux-4.4.111-vs2.3.9.5/fs/nfsd/nfsxdr.c
---- linux-4.4.111/fs/nfsd/nfsxdr.c 2018-01-11 07:57:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/nfsd/nfsxdr.c linux-4.4.113-vs2.3.9.6/fs/nfsd/nfsxdr.c
+--- linux-4.4.113/fs/nfsd/nfsxdr.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/nfsd/nfsxdr.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/dlmglue.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/dlmglue.c
---- linux-4.4.111/fs/ocfs2/dlmglue.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/dlmglue.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.c
+--- linux-4.4.113/fs/ocfs2/dlmglue.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.c 2018-01-09 16:36:32.000000000 +0000
@@ -2128,6 +2128,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-4.4.111/fs/ocfs2/dlmglue.h linux-4.4.111-vs2.3.9.5/fs/ocfs2/dlmglue.h
---- linux-4.4.111/fs/ocfs2/dlmglue.h 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/dlmglue.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.h
+--- linux-4.4.113/fs/ocfs2/dlmglue.h 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/dlmglue.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/file.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/file.c
---- linux-4.4.111/fs/ocfs2/file.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/file.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/file.c
+--- linux-4.4.113/fs/ocfs2/file.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/file.c 2018-01-09 16:36:32.000000000 +0000
@@ -1151,7 +1151,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.4.111/fs/ocfs2/inode.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/inode.c
---- linux-4.4.111/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.c
+--- linux-4.4.113/fs/ocfs2/inode.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/inode.h linux-4.4.111-vs2.3.9.5/fs/ocfs2/inode.h
---- linux-4.4.111/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/inode.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.h
+--- linux-4.4.113/fs/ocfs2/inode.h 2016-07-05 04:15:08.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/ioctl.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/ioctl.c
---- linux-4.4.111/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ioctl.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/ioctl.c
+--- linux-4.4.113/fs/ocfs2/ioctl.c 2015-10-29 09:21:37.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ioctl.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/namei.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/namei.c
---- linux-4.4.111/fs/ocfs2/namei.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/namei.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/namei.c
+--- linux-4.4.113/fs/ocfs2/namei.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/namei.c 2018-01-09 16:36:32.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-4.4.111/fs/ocfs2/ocfs2.h linux-4.4.111-vs2.3.9.5/fs/ocfs2/ocfs2.h
---- linux-4.4.111/fs/ocfs2/ocfs2.h 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ocfs2.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2.h
+--- linux-4.4.113/fs/ocfs2/ocfs2.h 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2.h 2018-01-09 17:21:54.000000000 +0000
@@ -289,6 +289,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */
OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-4.4.111/fs/ocfs2/ocfs2_fs.h linux-4.4.111-vs2.3.9.5/fs/ocfs2/ocfs2_fs.h
---- linux-4.4.111/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/ocfs2_fs.h linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2_fs.h
+--- linux-4.4.113/fs/ocfs2/ocfs2_fs.h 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/ocfs2_fs.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/ocfs2/super.c linux-4.4.111-vs2.3.9.5/fs/ocfs2/super.c
---- linux-4.4.111/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/ocfs2/super.c linux-4.4.113-vs2.3.9.6/fs/ocfs2/super.c
+--- linux-4.4.113/fs/ocfs2/super.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/ocfs2/super.c 2018-01-09 17:22:51.000000000 +0000
@@ -193,6 +193,7 @@ enum {
Opt_dir_resv_level,
Opt_journal_async_commit,
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-4.4.111/fs/open.c linux-4.4.111-vs2.3.9.5/fs/open.c
---- linux-4.4.111/fs/open.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/open.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/open.c linux-4.4.113-vs2.3.9.6/fs/open.c
+--- linux-4.4.113/fs/open.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/open.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/proc/array.c linux-4.4.111-vs2.3.9.5/fs/proc/array.c
---- linux-4.4.111/fs/proc/array.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/array.c linux-4.4.113-vs2.3.9.6/fs/proc/array.c
+--- linux-4.4.113/fs/proc/array.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/array.c 2018-01-09 17:30:44.000000000 +0000
@@ -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.4.111/fs/proc/base.c linux-4.4.111-vs2.3.9.5/fs/proc/base.c
---- linux-4.4.111/fs/proc/base.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/base.c linux-4.4.113-vs2.3.9.6/fs/proc/base.c
+--- linux-4.4.113/fs/proc/base.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/base.c 2018-01-09 16:36:32.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-4.4.111/fs/proc/generic.c linux-4.4.111-vs2.3.9.5/fs/proc/generic.c
---- linux-4.4.111/fs/proc/generic.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/generic.c linux-4.4.113-vs2.3.9.6/fs/proc/generic.c
+--- linux-4.4.113/fs/proc/generic.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/generic.c 2018-01-09 17:29:24.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-4.4.111/fs/proc/inode.c linux-4.4.111-vs2.3.9.5/fs/proc/inode.c
---- linux-4.4.111/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/inode.c linux-4.4.113-vs2.3.9.6/fs/proc/inode.c
+--- linux-4.4.113/fs/proc/inode.c 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/inode.c 2018-01-09 16:36:32.000000000 +0000
@@ -431,6 +431,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.4.111/fs/proc/internal.h linux-4.4.111-vs2.3.9.5/fs/proc/internal.h
---- linux-4.4.111/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/internal.h linux-4.4.113-vs2.3.9.6/fs/proc/internal.h
+--- linux-4.4.113/fs/proc/internal.h 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/internal.h 2018-01-09 16:36:32.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
/*
* base.c
-diff -NurpP --minimal linux-4.4.111/fs/proc/loadavg.c linux-4.4.111-vs2.3.9.5/fs/proc/loadavg.c
---- linux-4.4.111/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/loadavg.c linux-4.4.113-vs2.3.9.6/fs/proc/loadavg.c
+--- linux-4.4.113/fs/proc/loadavg.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/loadavg.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/proc/meminfo.c linux-4.4.111-vs2.3.9.5/fs/proc/meminfo.c
---- linux-4.4.111/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/meminfo.c 2018-01-12 18:43:53.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/meminfo.c linux-4.4.113-vs2.3.9.6/fs/proc/meminfo.c
+--- linux-4.4.113/fs/proc/meminfo.c 2016-07-05 04:15:09.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/meminfo.c 2018-01-12 18:43:53.000000000 +0000
@@ -43,7 +43,8 @@ static int meminfo_proc_show(struct seq_
si_swapinfo(&i);
committed = percpu_counter_read_positive(&vm_committed_as);
min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
if (available < 0)
-diff -NurpP --minimal linux-4.4.111/fs/proc/root.c linux-4.4.111-vs2.3.9.5/fs/proc/root.c
---- linux-4.4.111/fs/proc/root.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/root.c linux-4.4.113-vs2.3.9.6/fs/proc/root.c
+--- linux-4.4.113/fs/proc/root.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/root.c 2018-01-09 16:36:32.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
.subdir = RB_ROOT,
.name = "/proc",
};
-diff -NurpP --minimal linux-4.4.111/fs/proc/self.c linux-4.4.111-vs2.3.9.5/fs/proc/self.c
---- linux-4.4.111/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/self.c linux-4.4.113-vs2.3.9.6/fs/proc/self.c
+--- linux-4.4.113/fs/proc/self.c 2015-10-29 09:21:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/self.c 2018-01-09 16:36:32.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/sched.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.4.111/fs/proc/stat.c linux-4.4.111-vs2.3.9.5/fs/proc/stat.c
---- linux-4.4.111/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/stat.c linux-4.4.113-vs2.3.9.6/fs/proc/stat.c
+--- linux-4.4.113/fs/proc/stat.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/stat.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/proc/uptime.c linux-4.4.111-vs2.3.9.5/fs/proc/uptime.c
---- linux-4.4.111/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc/uptime.c linux-4.4.113-vs2.3.9.6/fs/proc/uptime.c
+--- linux-4.4.113/fs/proc/uptime.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc/uptime.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/proc_namespace.c linux-4.4.111-vs2.3.9.5/fs/proc_namespace.c
---- linux-4.4.111/fs/proc_namespace.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/proc_namespace.c linux-4.4.113-vs2.3.9.6/fs/proc_namespace.c
+--- linux-4.4.113/fs/proc_namespace.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/proc_namespace.c 2018-01-09 16:36:32.000000000 +0000
@@ -46,6 +46,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.4.111/fs/quota/dquot.c linux-4.4.111-vs2.3.9.5/fs/quota/dquot.c
---- linux-4.4.111/fs/quota/dquot.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/quota/dquot.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/quota/dquot.c linux-4.4.113-vs2.3.9.6/fs/quota/dquot.c
+--- linux-4.4.113/fs/quota/dquot.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/quota/dquot.c 2018-01-09 16:36:32.000000000 +0000
@@ -1643,6 +1643,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.4.111/fs/quota/quota.c linux-4.4.111-vs2.3.9.5/fs/quota/quota.c
---- linux-4.4.111/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/quota/quota.c linux-4.4.113-vs2.3.9.6/fs/quota/quota.c
+--- linux-4.4.113/fs/quota/quota.c 2016-07-05 04:12:34.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/quota/quota.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/stat.c linux-4.4.111-vs2.3.9.5/fs/stat.c
---- linux-4.4.111/fs/stat.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/stat.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/stat.c linux-4.4.113-vs2.3.9.6/fs/stat.c
+--- linux-4.4.113/fs/stat.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/stat.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/statfs.c linux-4.4.111-vs2.3.9.5/fs/statfs.c
---- linux-4.4.111/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/statfs.c linux-4.4.113-vs2.3.9.6/fs/statfs.c
+--- linux-4.4.113/fs/statfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/statfs.c 2018-01-09 16:36:32.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
return retval;
}
-diff -NurpP --minimal linux-4.4.111/fs/super.c linux-4.4.111-vs2.3.9.5/fs/super.c
---- linux-4.4.111/fs/super.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/super.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/super.c linux-4.4.113-vs2.3.9.6/fs/super.c
+--- linux-4.4.113/fs/super.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/super.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/utimes.c linux-4.4.111-vs2.3.9.5/fs/utimes.c
---- linux-4.4.111/fs/utimes.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/utimes.c linux-4.4.113-vs2.3.9.6/fs/utimes.c
+--- linux-4.4.113/fs/utimes.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/utimes.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/fs/xattr.c linux-4.4.111-vs2.3.9.5/fs/xattr.c
---- linux-4.4.111/fs/xattr.c 2018-01-11 07:57:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/fs/xattr.c linux-4.4.113-vs2.3.9.6/fs/xattr.c
+--- linux-4.4.113/fs/xattr.c 2018-01-24 21:22:53.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/fs/xattr.c 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/capability.h linux-4.4.111-vs2.3.9.5/include/linux/capability.h
---- linux-4.4.111/include/linux/capability.h 2018-01-11 07:57:47.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/capability.h linux-4.4.113-vs2.3.9.6/include/linux/capability.h
+--- linux-4.4.113/include/linux/capability.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
@@ -77,7 +77,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.4.111/include/linux/cred.h linux-4.4.111-vs2.3.9.5/include/linux/cred.h
---- linux-4.4.111/include/linux/cred.h 2018-01-11 07:57:47.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/cred.h 2018-01-11 08:03:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/cred.h linux-4.4.113-vs2.3.9.6/include/linux/cred.h
+--- linux-4.4.113/include/linux/cred.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/cred.h 2018-01-11 08:03:00.000000000 +0000
@@ -161,6 +161,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-4.4.111/include/linux/dcache.h linux-4.4.111-vs2.3.9.5/include/linux/dcache.h
---- linux-4.4.111/include/linux/dcache.h 2018-01-11 07:57:47.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/dcache.h linux-4.4.113-vs2.3.9.6/include/linux/dcache.h
+--- linux-4.4.113/include/linux/dcache.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/dcache.h 2018-01-09 16:36:32.000000000 +0000
@@ -10,6 +10,7 @@
#include <linux/cache.h>
#include <linux/rcupdate.h>
return dentry;
}
-diff -NurpP --minimal linux-4.4.111/include/linux/devpts_fs.h linux-4.4.111-vs2.3.9.5/include/linux/devpts_fs.h
---- linux-4.4.111/include/linux/devpts_fs.h 2018-01-11 07:57:47.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/devpts_fs.h linux-4.4.113-vs2.3.9.6/include/linux/devpts_fs.h
+--- linux-4.4.113/include/linux/devpts_fs.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/devpts_fs.h 2018-01-09 16:36:32.000000000 +0000
@@ -35,5 +35,4 @@ void devpts_pty_kill(struct inode *inode
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/fs.h linux-4.4.111-vs2.3.9.5/include/linux/fs.h
---- linux-4.4.111/include/linux/fs.h 2018-01-11 07:57:47.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/fs.h 2018-01-09 16:43:56.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/fs.h linux-4.4.113-vs2.3.9.6/include/linux/fs.h
+--- linux-4.4.113/include/linux/fs.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/fs.h 2018-01-09 16:43:56.000000000 +0000
@@ -227,6 +227,7 @@ typedef void (dax_iodone_t)(struct buffe
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
#define ATTR_TIMES_SET (1 << 16)
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-4.4.111/include/linux/init_task.h linux-4.4.111-vs2.3.9.5/include/linux/init_task.h
---- linux-4.4.111/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/init_task.h linux-4.4.113-vs2.3.9.6/include/linux/init_task.h
+--- linux-4.4.113/include/linux/init_task.h 2016-07-05 04:15:10.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/init_task.h 2018-01-09 16:36:32.000000000 +0000
@@ -260,6 +260,10 @@ extern struct task_group root_task_group
INIT_VTIME(tsk) \
INIT_NUMA_BALANCING(tsk) \
}
-diff -NurpP --minimal linux-4.4.111/include/linux/ipc.h linux-4.4.111-vs2.3.9.5/include/linux/ipc.h
---- linux-4.4.111/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/ipc.h linux-4.4.113-vs2.3.9.6/include/linux/ipc.h
+--- linux-4.4.113/include/linux/ipc.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/ipc.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/memcontrol.h linux-4.4.111-vs2.3.9.5/include/linux/memcontrol.h
---- linux-4.4.111/include/linux/memcontrol.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/memcontrol.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/memcontrol.h linux-4.4.113-vs2.3.9.6/include/linux/memcontrol.h
+--- linux-4.4.113/include/linux/memcontrol.h 2018-01-24 21:22:56.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/memcontrol.h 2018-01-24 22:44:17.000000000 +0000
@@ -113,6 +113,7 @@ struct cg_proto {
struct mem_cgroup *memcg;
};
#ifdef CONFIG_MEMCG
struct mem_cgroup_stat_cpu {
long count[MEM_CGROUP_STAT_NSTATS];
-@@ -338,6 +339,11 @@ static inline bool mem_cgroup_is_descend
+@@ -338,6 +339,12 @@ static inline bool mem_cgroup_is_descend
return cgroup_is_descendant(memcg->css.cgroup, root->css.cgroup);
}
-+extern u64 mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg);
-+extern u64 mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg);
-+extern u64 mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg);
-+extern u64 mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg);
++extern unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg);
++extern void dump_mem_cgroup(struct mem_cgroup *memcg);
+
static inline bool mm_match_cgroup(struct mm_struct *mm,
struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-4.4.111/include/linux/mount.h linux-4.4.111-vs2.3.9.5/include/linux/mount.h
---- linux-4.4.111/include/linux/mount.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/mount.h linux-4.4.113-vs2.3.9.6/include/linux/mount.h
+--- linux-4.4.113/include/linux/mount.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/mount.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/net.h linux-4.4.111-vs2.3.9.5/include/linux/net.h
---- linux-4.4.111/include/linux/net.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/net.h linux-4.4.113-vs2.3.9.6/include/linux/net.h
+--- linux-4.4.113/include/linux/net.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/net.h 2018-01-09 16:42:30.000000000 +0000
@@ -43,6 +43,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-4.4.111/include/linux/netdevice.h linux-4.4.111-vs2.3.9.5/include/linux/netdevice.h
---- linux-4.4.111/include/linux/netdevice.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/netdevice.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/netdevice.h linux-4.4.113-vs2.3.9.6/include/linux/netdevice.h
+--- linux-4.4.113/include/linux/netdevice.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/netdevice.h 2018-01-09 16:36:32.000000000 +0000
@@ -2296,6 +2296,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.4.111/include/linux/nsproxy.h linux-4.4.111-vs2.3.9.5/include/linux/nsproxy.h
---- linux-4.4.111/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/nsproxy.h linux-4.4.113-vs2.3.9.6/include/linux/nsproxy.h
+--- linux-4.4.113/include/linux/nsproxy.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/nsproxy.h 2018-01-09 16:36:32.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
}
#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/pid.h linux-4.4.111-vs2.3.9.5/include/linux/pid.h
---- linux-4.4.111/include/linux/pid.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/pid.h linux-4.4.113-vs2.3.9.6/include/linux/pid.h
+--- linux-4.4.113/include/linux/pid.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/pid.h 2018-01-09 16:45:21.000000000 +0000
@@ -10,7 +10,8 @@ enum pid_type
PIDTYPE_SID,
PIDTYPE_MAX,
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-4.4.111/include/linux/quotaops.h linux-4.4.111-vs2.3.9.5/include/linux/quotaops.h
---- linux-4.4.111/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/quotaops.h linux-4.4.113-vs2.3.9.6/include/linux/quotaops.h
+--- linux-4.4.113/include/linux/quotaops.h 2016-07-05 04:12:37.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/quotaops.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/sched.h linux-4.4.111-vs2.3.9.5/include/linux/sched.h
---- linux-4.4.111/include/linux/sched.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/sched.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/sched.h linux-4.4.113-vs2.3.9.6/include/linux/sched.h
+--- linux-4.4.113/include/linux/sched.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/sched.h 2018-01-09 16:36:32.000000000 +0000
@@ -1600,6 +1600,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
}
-diff -NurpP --minimal linux-4.4.111/include/linux/shmem_fs.h linux-4.4.111-vs2.3.9.5/include/linux/shmem_fs.h
---- linux-4.4.111/include/linux/shmem_fs.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/shmem_fs.h linux-4.4.113-vs2.3.9.6/include/linux/shmem_fs.h
+--- linux-4.4.113/include/linux/shmem_fs.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/shmem_fs.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/stat.h linux-4.4.111-vs2.3.9.5/include/linux/stat.h
---- linux-4.4.111/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/stat.h linux-4.4.113-vs2.3.9.6/include/linux/stat.h
+--- linux-4.4.113/include/linux/stat.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/stat.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/sunrpc/auth.h linux-4.4.111-vs2.3.9.5/include/linux/sunrpc/auth.h
---- linux-4.4.111/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/auth.h linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/auth.h
+--- linux-4.4.113/include/linux/sunrpc/auth.h 2016-07-05 04:12:37.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/auth.h 2018-01-09 16:36:32.000000000 +0000
@@ -40,6 +40,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.4.111/include/linux/sunrpc/clnt.h linux-4.4.111-vs2.3.9.5/include/linux/sunrpc/clnt.h
---- linux-4.4.111/include/linux/sunrpc/clnt.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/sunrpc/clnt.h linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/clnt.h
+--- linux-4.4.113/include/linux/sunrpc/clnt.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/sunrpc/clnt.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/types.h linux-4.4.111-vs2.3.9.5/include/linux/types.h
---- linux-4.4.111/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/types.h linux-4.4.113-vs2.3.9.6/include/linux/types.h
+--- linux-4.4.113/include/linux/types.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/types.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/uidgid.h linux-4.4.111-vs2.3.9.5/include/linux/uidgid.h
---- linux-4.4.111/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/uidgid.h linux-4.4.113-vs2.3.9.6/include/linux/uidgid.h
+--- linux-4.4.113/include/linux/uidgid.h 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/uidgid.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vroot.h linux-4.4.111-vs2.3.9.5/include/linux/vroot.h
---- linux-4.4.111/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vroot.h linux-4.4.113-vs2.3.9.6/include/linux/vroot.h
+--- linux-4.4.113/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vroot.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vs_base.h linux-4.4.111-vs2.3.9.5/include/linux/vs_base.h
---- linux-4.4.111/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_base.h linux-4.4.113-vs2.3.9.6/include/linux/vs_base.h
+--- linux-4.4.113/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_base.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_context.h linux-4.4.111-vs2.3.9.5/include/linux/vs_context.h
---- linux-4.4.111/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_context.h linux-4.4.113-vs2.3.9.6/include/linux/vs_context.h
+--- linux-4.4.113/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_context.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_cowbl.h linux-4.4.111-vs2.3.9.5/include/linux/vs_cowbl.h
---- linux-4.4.111/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_cowbl.h linux-4.4.113-vs2.3.9.6/include/linux/vs_cowbl.h
+--- linux-4.4.113/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_cowbl.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_cvirt.h linux-4.4.111-vs2.3.9.5/include/linux/vs_cvirt.h
---- linux-4.4.111/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_cvirt.h linux-4.4.113-vs2.3.9.6/include/linux/vs_cvirt.h
+--- linux-4.4.113/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_cvirt.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_device.h linux-4.4.111-vs2.3.9.5/include/linux/vs_device.h
---- linux-4.4.111/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_device.h linux-4.4.113-vs2.3.9.6/include/linux/vs_device.h
+--- linux-4.4.113/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_device.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_dlimit.h linux-4.4.111-vs2.3.9.5/include/linux/vs_dlimit.h
---- linux-4.4.111/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_dlimit.h linux-4.4.113-vs2.3.9.6/include/linux/vs_dlimit.h
+--- linux-4.4.113/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_dlimit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_inet.h linux-4.4.111-vs2.3.9.5/include/linux/vs_inet.h
---- linux-4.4.111/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet.h linux-4.4.113-vs2.3.9.6/include/linux/vs_inet.h
+--- linux-4.4.113/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_inet.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_inet6.h linux-4.4.111-vs2.3.9.5/include/linux/vs_inet6.h
---- linux-4.4.111/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_inet6.h linux-4.4.113-vs2.3.9.6/include/linux/vs_inet6.h
+--- linux-4.4.113/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_inet6.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_limit.h linux-4.4.111-vs2.3.9.5/include/linux/vs_limit.h
---- linux-4.4.111/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_limit.h linux-4.4.113-vs2.3.9.6/include/linux/vs_limit.h
+--- linux-4.4.113/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_limit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_network.h linux-4.4.111-vs2.3.9.5/include/linux/vs_network.h
---- linux-4.4.111/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_network.h linux-4.4.113-vs2.3.9.6/include/linux/vs_network.h
+--- linux-4.4.113/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_network.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_pid.h linux-4.4.111-vs2.3.9.5/include/linux/vs_pid.h
---- linux-4.4.111/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_pid.h linux-4.4.113-vs2.3.9.6/include/linux/vs_pid.h
+--- linux-4.4.113/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_pid.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_sched.h linux-4.4.111-vs2.3.9.5/include/linux/vs_sched.h
---- linux-4.4.111/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_sched.h linux-4.4.113-vs2.3.9.6/include/linux/vs_sched.h
+--- linux-4.4.113/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_sched.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_socket.h linux-4.4.111-vs2.3.9.5/include/linux/vs_socket.h
---- linux-4.4.111/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_socket.h linux-4.4.113-vs2.3.9.6/include/linux/vs_socket.h
+--- linux-4.4.113/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_socket.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_tag.h linux-4.4.111-vs2.3.9.5/include/linux/vs_tag.h
---- linux-4.4.111/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_tag.h linux-4.4.113-vs2.3.9.6/include/linux/vs_tag.h
+--- linux-4.4.113/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_tag.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vs_time.h linux-4.4.111-vs2.3.9.5/include/linux/vs_time.h
---- linux-4.4.111/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vs_time.h linux-4.4.113-vs2.3.9.6/include/linux/vs_time.h
+--- linux-4.4.113/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vs_time.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/base.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/base.h
---- linux-4.4.111/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/base.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/base.h
+--- linux-4.4.113/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/base.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cacct.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct.h
---- linux-4.4.111/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct.h
+--- linux-4.4.113/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/cacct_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_cmd.h
---- linux-4.4.111/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_cmd.h
+--- linux-4.4.113/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cacct_def.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_def.h
---- linux-4.4.111/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_def.h
+--- linux-4.4.113/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cacct_int.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_int.h
---- linux-4.4.111/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cacct_int.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_int.h
+--- linux-4.4.113/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cacct_int.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/check.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/check.h
---- linux-4.4.111/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/check.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/check.h
+--- linux-4.4.113/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/check.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/context.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/context.h
---- linux-4.4.111/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/context.h
+--- linux-4.4.113/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/context.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/context_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/context_cmd.h
---- linux-4.4.111/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/context_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/context_cmd.h
+--- linux-4.4.113/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/context_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cvirt.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt.h
---- linux-4.4.111/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt.h
+--- linux-4.4.113/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cvirt_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt_cmd.h
---- linux-4.4.111/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_cmd.h
+--- linux-4.4.113/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/cvirt_def.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt_def.h
---- linux-4.4.111/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/cvirt_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_def.h
+--- linux-4.4.113/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/cvirt_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/debug.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/debug.h
---- linux-4.4.111/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug.h
+--- linux-4.4.113/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/debug_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/debug_cmd.h
---- linux-4.4.111/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/debug_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug_cmd.h
+--- linux-4.4.113/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/debug_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/device.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/device.h
---- linux-4.4.111/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device.h
+--- linux-4.4.113/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/device_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/device_cmd.h
---- linux-4.4.111/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_cmd.h
+--- linux-4.4.113/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/device_def.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/device_def.h
---- linux-4.4.111/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/device_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_def.h
+--- linux-4.4.113/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/device_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/dlimit.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/dlimit.h
---- linux-4.4.111/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit.h
+--- linux-4.4.113/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/dlimit_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/dlimit_cmd.h
---- linux-4.4.111/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/dlimit_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit_cmd.h
+--- linux-4.4.113/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/dlimit_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/global.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/global.h
---- linux-4.4.111/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/global.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/global.h
+--- linux-4.4.113/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/global.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/history.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/history.h
---- linux-4.4.111/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/history.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/history.h
+--- linux-4.4.113/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/history.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/inode.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/inode.h
---- linux-4.4.111/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode.h
+--- linux-4.4.113/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/inode_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/inode_cmd.h
---- linux-4.4.111/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/inode_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode_cmd.h
+--- linux-4.4.113/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/inode_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/limit.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit.h
---- linux-4.4.111/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit.h
+--- linux-4.4.113/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/limit_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_cmd.h
---- linux-4.4.111/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_cmd.h
+--- linux-4.4.113/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/limit_def.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_def.h
---- linux-4.4.111/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_def.h
+--- linux-4.4.113/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/limit_int.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_int.h
---- linux-4.4.111/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/limit_int.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_int.h
+--- linux-4.4.113/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/limit_int.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/monitor.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/monitor.h
---- linux-4.4.111/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/monitor.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/monitor.h
+--- linux-4.4.113/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/monitor.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/network.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/network.h
---- linux-4.4.111/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/network.h
+--- linux-4.4.113/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/network.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/network_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/network_cmd.h
---- linux-4.4.111/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/network_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/network_cmd.h
+--- linux-4.4.113/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/network_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/percpu.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/percpu.h
---- linux-4.4.111/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/percpu.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/percpu.h
+--- linux-4.4.113/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/percpu.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/pid.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/pid.h
---- linux-4.4.111/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/pid.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/pid.h
+--- linux-4.4.113/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/pid.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
+}
+
+#endif
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/sched.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched.h
---- linux-4.4.111/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched.h
+--- linux-4.4.113/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/sched_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched_cmd.h
---- linux-4.4.111/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_cmd.h
+--- linux-4.4.113/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/sched_def.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched_def.h
---- linux-4.4.111/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/sched_def.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_def.h
+--- linux-4.4.113/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/sched_def.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/signal.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/signal.h
---- linux-4.4.111/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal.h
+--- linux-4.4.113/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/signal_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/signal_cmd.h
---- linux-4.4.111/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/signal_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal_cmd.h
+--- linux-4.4.113/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/signal_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/space.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/space.h
---- linux-4.4.111/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/space.h
+--- linux-4.4.113/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/space.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/space_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/space_cmd.h
---- linux-4.4.111/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/space_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/space_cmd.h
+--- linux-4.4.113/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/space_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/switch.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/switch.h
---- linux-4.4.111/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/switch.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/switch.h
+--- linux-4.4.113/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/switch.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/linux/vserver/tag.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/tag.h
---- linux-4.4.111/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag.h
+--- linux-4.4.113/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag.h 2018-01-09 16:36:32.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-4.4.111/include/linux/vserver/tag_cmd.h linux-4.4.111-vs2.3.9.5/include/linux/vserver/tag_cmd.h
---- linux-4.4.111/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/linux/vserver/tag_cmd.h linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag_cmd.h
+--- linux-4.4.113/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/linux/vserver/tag_cmd.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/net/addrconf.h linux-4.4.111-vs2.3.9.5/include/net/addrconf.h
---- linux-4.4.111/include/net/addrconf.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/addrconf.h linux-4.4.113-vs2.3.9.6/include/net/addrconf.h
+--- linux-4.4.113/include/net/addrconf.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/addrconf.h 2018-01-09 16:36:32.000000000 +0000
@@ -84,7 +84,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.4.111/include/net/af_unix.h linux-4.4.111-vs2.3.9.5/include/net/af_unix.h
---- linux-4.4.111/include/net/af_unix.h 2018-01-11 07:57:48.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/af_unix.h linux-4.4.113-vs2.3.9.6/include/net/af_unix.h
+--- linux-4.4.113/include/net/af_unix.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/af_unix.h 2018-01-09 16:36:32.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
#include <net/sock.h>
void unix_inflight(struct user_struct *user, struct file *fp);
-diff -NurpP --minimal linux-4.4.111/include/net/inet_timewait_sock.h linux-4.4.111-vs2.3.9.5/include/net/inet_timewait_sock.h
---- linux-4.4.111/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/inet_timewait_sock.h linux-4.4.113-vs2.3.9.6/include/net/inet_timewait_sock.h
+--- linux-4.4.113/include/net/inet_timewait_sock.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/inet_timewait_sock.h 2018-01-09 16:40:17.000000000 +0000
@@ -71,6 +71,10 @@ struct inet_timewait_sock {
#define tw_num __tw_common.skc_num
#define tw_cookie __tw_common.skc_cookie
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-4.4.111/include/net/ip6_route.h linux-4.4.111-vs2.3.9.5/include/net/ip6_route.h
---- linux-4.4.111/include/net/ip6_route.h 2018-01-11 07:57:49.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/ip6_route.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/ip6_route.h linux-4.4.113-vs2.3.9.6/include/net/ip6_route.h
+--- linux-4.4.113/include/net/ip6_route.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/ip6_route.h 2018-01-09 16:36:32.000000000 +0000
@@ -90,7 +90,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.4.111/include/net/route.h linux-4.4.111-vs2.3.9.5/include/net/route.h
---- linux-4.4.111/include/net/route.h 2016-07-05 04:15:11.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/route.h 2018-01-09 16:39:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/route.h linux-4.4.113-vs2.3.9.6/include/net/route.h
+--- linux-4.4.113/include/net/route.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/route.h 2018-01-09 16:39:47.000000000 +0000
@@ -223,6 +223,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.4.111/include/net/sock.h linux-4.4.111-vs2.3.9.5/include/net/sock.h
---- linux-4.4.111/include/net/sock.h 2018-01-11 07:57:49.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/net/sock.h linux-4.4.113-vs2.3.9.6/include/net/sock.h
+--- linux-4.4.113/include/net/sock.h 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/net/sock.h 2018-01-09 16:41:40.000000000 +0000
@@ -201,6 +201,10 @@ struct sock_common {
struct in6_addr skc_v6_daddr;
struct in6_addr skc_v6_rcv_saddr;
#define sk_incoming_cpu __sk_common.skc_incoming_cpu
#define sk_flags __sk_common.skc_flags
#define sk_rxhash __sk_common.skc_rxhash
-diff -NurpP --minimal linux-4.4.111/include/uapi/Kbuild linux-4.4.111-vs2.3.9.5/include/uapi/Kbuild
---- linux-4.4.111/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/Kbuild linux-4.4.113-vs2.3.9.6/include/uapi/Kbuild
+--- linux-4.4.113/include/uapi/Kbuild 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/Kbuild 2018-01-09 16:36:32.000000000 +0000
@@ -13,3 +13,4 @@ header-y += drm/
header-y += xen/
header-y += scsi/
header-y += misc/
+header-y += vserver/
-diff -NurpP --minimal linux-4.4.111/include/uapi/linux/capability.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/capability.h
---- linux-4.4.111/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/capability.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/capability.h
+--- linux-4.4.113/include/uapi/linux/capability.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/capability.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/uapi/linux/fs.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/fs.h
---- linux-4.4.111/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/fs.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/fs.h
+--- linux-4.4.113/include/uapi/linux/fs.h 2016-07-05 04:15:11.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/fs.h 2018-01-09 16:47:48.000000000 +0000
@@ -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.4.111/include/uapi/linux/gfs2_ondisk.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/gfs2_ondisk.h
---- linux-4.4.111/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/gfs2_ondisk.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/gfs2_ondisk.h
+--- linux-4.4.113/include/uapi/linux/gfs2_ondisk.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/gfs2_ondisk.h 2018-01-09 16:36:32.000000000 +0000
@@ -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.4.111/include/uapi/linux/if_tun.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/if_tun.h
---- linux-4.4.111/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/if_tun.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/if_tun.h
+--- linux-4.4.113/include/uapi/linux/if_tun.h 2015-10-29 09:21:42.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/if_tun.h 2018-01-09 16:46:34.000000000 +0000
@@ -56,6 +56,7 @@
*/
#define TUNSETVNETBE _IOW('T', 222, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-4.4.111/include/uapi/linux/major.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/major.h
---- linux-4.4.111/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/major.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/major.h
+--- linux-4.4.113/include/uapi/linux/major.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/major.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/linux/nfs_mount.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/nfs_mount.h
---- linux-4.4.111/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/nfs_mount.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/nfs_mount.h
+--- linux-4.4.113/include/uapi/linux/nfs_mount.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/nfs_mount.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/linux/reboot.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/reboot.h
---- linux-4.4.111/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/reboot.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/reboot.h
+--- linux-4.4.113/include/uapi/linux/reboot.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/reboot.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/linux/sysctl.h linux-4.4.111-vs2.3.9.5/include/uapi/linux/sysctl.h
---- linux-4.4.111/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/linux/sysctl.h linux-4.4.113-vs2.3.9.6/include/uapi/linux/sysctl.h
+--- linux-4.4.113/include/uapi/linux/sysctl.h 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/linux/sysctl.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/Kbuild linux-4.4.111-vs2.3.9.5/include/uapi/vserver/Kbuild
---- linux-4.4.111/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/Kbuild linux-4.4.113-vs2.3.9.6/include/uapi/vserver/Kbuild
+--- linux-4.4.113/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/Kbuild 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/cacct_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/cacct_cmd.h
---- linux-4.4.111/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cacct_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cacct_cmd.h
+--- linux-4.4.113/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cacct_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/context.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/context.h
---- linux-4.4.111/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context.h
+--- linux-4.4.113/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/context_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/context_cmd.h
---- linux-4.4.111/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/context_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context_cmd.h
+--- linux-4.4.113/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/context_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/cvirt_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/cvirt_cmd.h
---- linux-4.4.111/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/cvirt_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cvirt_cmd.h
+--- linux-4.4.113/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/cvirt_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/debug_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/debug_cmd.h
---- linux-4.4.111/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/debug_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/debug_cmd.h
+--- linux-4.4.113/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/debug_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/device.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/device.h
---- linux-4.4.111/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device.h
+--- linux-4.4.113/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/device_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/device_cmd.h
---- linux-4.4.111/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/device_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device_cmd.h
+--- linux-4.4.113/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/device_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/dlimit_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/dlimit_cmd.h
---- linux-4.4.111/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/dlimit_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/dlimit_cmd.h
+--- linux-4.4.113/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/dlimit_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/inode.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/inode.h
---- linux-4.4.111/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode.h
+--- linux-4.4.113/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/inode_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/inode_cmd.h
---- linux-4.4.111/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/inode_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode_cmd.h
+--- linux-4.4.113/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/inode_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/limit.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/limit.h
---- linux-4.4.111/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit.h
+--- linux-4.4.113/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/limit_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/limit_cmd.h
---- linux-4.4.111/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/limit_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit_cmd.h
+--- linux-4.4.113/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/limit_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/monitor.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/monitor.h
---- linux-4.4.111/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/monitor.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/monitor.h
+--- linux-4.4.113/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/monitor.h 2018-01-09 16:36:33.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-4.4.111/include/uapi/vserver/network.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/network.h
---- linux-4.4.111/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network.h
+--- linux-4.4.113/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/network_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/network_cmd.h
---- linux-4.4.111/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/network_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network_cmd.h
+--- linux-4.4.113/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/network_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/sched_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/sched_cmd.h
---- linux-4.4.111/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/sched_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/sched_cmd.h
+--- linux-4.4.113/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/sched_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/signal_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/signal_cmd.h
---- linux-4.4.111/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/signal_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/signal_cmd.h
+--- linux-4.4.113/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/signal_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/space_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/space_cmd.h
---- linux-4.4.111/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/space_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/space_cmd.h
+--- linux-4.4.113/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/space_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/switch.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/switch.h
---- linux-4.4.111/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/switch.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/switch.h
+--- linux-4.4.113/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/switch.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/include/uapi/vserver/tag_cmd.h linux-4.4.111-vs2.3.9.5/include/uapi/vserver/tag_cmd.h
---- linux-4.4.111/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/include/uapi/vserver/tag_cmd.h linux-4.4.113-vs2.3.9.6/include/uapi/vserver/tag_cmd.h
+--- linux-4.4.113/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/include/uapi/vserver/tag_cmd.h 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/init/Kconfig linux-4.4.111-vs2.3.9.5/init/Kconfig
---- linux-4.4.111/init/Kconfig 2016-07-05 04:15:12.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/init/Kconfig 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/init/Kconfig linux-4.4.113-vs2.3.9.6/init/Kconfig
+--- linux-4.4.113/init/Kconfig 2016-07-05 04:15:12.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/init/Kconfig 2018-01-09 16:36:33.000000000 +0000
@@ -927,6 +927,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.4.111/init/main.c linux-4.4.111-vs2.3.9.5/init/main.c
---- linux-4.4.111/init/main.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/init/main.c 2018-01-09 16:58:21.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/init/main.c linux-4.4.113-vs2.3.9.6/init/main.c
+--- linux-4.4.113/init/main.c 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/init/main.c 2018-01-09 16:58:21.000000000 +0000
@@ -82,6 +82,7 @@
#include <linux/proc_ns.h>
#include <linux/io.h>
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-4.4.111/ipc/mqueue.c linux-4.4.111-vs2.3.9.5/ipc/mqueue.c
---- linux-4.4.111/ipc/mqueue.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/ipc/mqueue.c linux-4.4.113-vs2.3.9.6/ipc/mqueue.c
+--- linux-4.4.113/ipc/mqueue.c 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/ipc/mqueue.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/ipc/msg.c linux-4.4.111-vs2.3.9.5/ipc/msg.c
---- linux-4.4.111/ipc/msg.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/ipc/msg.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/ipc/msg.c linux-4.4.113-vs2.3.9.6/ipc/msg.c
+--- linux-4.4.113/ipc/msg.c 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/ipc/msg.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/ipc/sem.c linux-4.4.111-vs2.3.9.5/ipc/sem.c
---- linux-4.4.111/ipc/sem.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/ipc/sem.c linux-4.4.113-vs2.3.9.6/ipc/sem.c
+--- linux-4.4.113/ipc/sem.c 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/ipc/sem.c 2018-01-09 16:36:33.000000000 +0000
@@ -85,6 +85,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-4.4.111/ipc/shm.c linux-4.4.111-vs2.3.9.5/ipc/shm.c
---- linux-4.4.111/ipc/shm.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/ipc/shm.c linux-4.4.113-vs2.3.9.6/ipc/shm.c
+--- linux-4.4.113/ipc/shm.c 2018-01-24 21:22:57.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/ipc/shm.c 2018-01-09 16:36:33.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
return error;
no_id:
-diff -NurpP --minimal linux-4.4.111/kernel/Makefile linux-4.4.111-vs2.3.9.5/kernel/Makefile
---- linux-4.4.111/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/Makefile linux-4.4.113-vs2.3.9.6/kernel/Makefile
+--- linux-4.4.113/kernel/Makefile 2016-07-05 04:12:38.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/Makefile 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/auditsc.c linux-4.4.111-vs2.3.9.5/kernel/auditsc.c
---- linux-4.4.111/kernel/auditsc.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/auditsc.c linux-4.4.113-vs2.3.9.6/kernel/auditsc.c
+--- linux-4.4.113/kernel/auditsc.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/auditsc.c 2018-01-09 16:36:33.000000000 +0000
@@ -1962,7 +1962,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.4.111/kernel/capability.c linux-4.4.111-vs2.3.9.5/kernel/capability.c
---- linux-4.4.111/kernel/capability.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/capability.c linux-4.4.113-vs2.3.9.6/kernel/capability.c
+--- linux-4.4.113/kernel/capability.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/capability.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/compat.c linux-4.4.111-vs2.3.9.5/kernel/compat.c
---- linux-4.4.111/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/compat.c linux-4.4.113-vs2.3.9.6/kernel/compat.c
+--- linux-4.4.113/kernel/compat.c 2015-07-06 20:41:43.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/compat.c 2018-01-09 16:36:33.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
return 0;
}
-diff -NurpP --minimal linux-4.4.111/kernel/cred.c linux-4.4.111-vs2.3.9.5/kernel/cred.c
---- linux-4.4.111/kernel/cred.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/cred.c linux-4.4.113-vs2.3.9.6/kernel/cred.c
+--- linux-4.4.113/kernel/cred.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/cred.c 2018-01-09 16:36:33.000000000 +0000
@@ -64,31 +64,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-4.4.111/kernel/exit.c linux-4.4.111-vs2.3.9.5/kernel/exit.c
---- linux-4.4.111/kernel/exit.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/exit.c 2018-01-09 16:59:03.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/exit.c linux-4.4.113-vs2.3.9.6/kernel/exit.c
+--- linux-4.4.113/kernel/exit.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/exit.c 2018-01-09 16:59:03.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-4.4.111/kernel/fork.c linux-4.4.111-vs2.3.9.5/kernel/fork.c
---- linux-4.4.111/kernel/fork.c 2018-01-11 07:57:51.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/fork.c linux-4.4.113-vs2.3.9.6/kernel/fork.c
+--- linux-4.4.113/kernel/fork.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/fork.c 2018-01-09 17:00:00.000000000 +0000
@@ -76,6 +76,9 @@
#include <linux/aio.h>
#include <linux/compiler.h>
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
-diff -NurpP --minimal linux-4.4.111/kernel/kthread.c linux-4.4.111-vs2.3.9.5/kernel/kthread.c
---- linux-4.4.111/kernel/kthread.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/kthread.c linux-4.4.113-vs2.3.9.6/kernel/kthread.c
+--- linux-4.4.113/kernel/kthread.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/kthread.c 2018-01-09 17:01:06.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/ptrace.h>
#include <linux/uaccess.h>
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-4.4.111/kernel/nsproxy.c linux-4.4.111-vs2.3.9.5/kernel/nsproxy.c
---- linux-4.4.111/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/nsproxy.c linux-4.4.113-vs2.3.9.6/kernel/nsproxy.c
+--- linux-4.4.113/kernel/nsproxy.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/nsproxy.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/pid.c linux-4.4.111-vs2.3.9.5/kernel/pid.c
---- linux-4.4.111/kernel/pid.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/pid.c linux-4.4.113-vs2.3.9.6/kernel/pid.c
+--- linux-4.4.113/kernel/pid.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/pid.c 2018-01-09 21:54:23.000000000 +0000
@@ -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.4.111/kernel/pid_namespace.c linux-4.4.111-vs2.3.9.5/kernel/pid_namespace.c
---- linux-4.4.111/kernel/pid_namespace.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/pid_namespace.c linux-4.4.113-vs2.3.9.6/kernel/pid_namespace.c
+--- linux-4.4.113/kernel/pid_namespace.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/pid_namespace.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/printk/printk.c linux-4.4.111-vs2.3.9.5/kernel/printk/printk.c
---- linux-4.4.111/kernel/printk/printk.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/printk/printk.c linux-4.4.113-vs2.3.9.6/kernel/printk/printk.c
+--- linux-4.4.113/kernel/printk/printk.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/printk/printk.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/ptrace.c linux-4.4.111-vs2.3.9.5/kernel/ptrace.c
---- linux-4.4.111/kernel/ptrace.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/ptrace.c linux-4.4.113-vs2.3.9.6/kernel/ptrace.c
+--- linux-4.4.113/kernel/ptrace.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/ptrace.c 2018-01-09 16:36:33.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-4.4.111/kernel/reboot.c linux-4.4.111-vs2.3.9.5/kernel/reboot.c
---- linux-4.4.111/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/reboot.c linux-4.4.113-vs2.3.9.6/kernel/reboot.c
+--- linux-4.4.113/kernel/reboot.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/reboot.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/sched/core.c linux-4.4.111-vs2.3.9.5/kernel/sched/core.c
---- linux-4.4.111/kernel/sched/core.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sched/core.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sched/core.c linux-4.4.113-vs2.3.9.6/kernel/sched/core.c
+--- linux-4.4.113/kernel/sched/core.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sched/core.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/sched/cputime.c linux-4.4.111-vs2.3.9.5/kernel/sched/cputime.c
---- linux-4.4.111/kernel/sched/cputime.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sched/cputime.c linux-4.4.113-vs2.3.9.6/kernel/sched/cputime.c
+--- linux-4.4.113/kernel/sched/cputime.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sched/cputime.c 2018-01-09 16:36:33.000000000 +0000
@@ -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.4.111/kernel/sched/fair.c linux-4.4.111-vs2.3.9.5/kernel/sched/fair.c
---- linux-4.4.111/kernel/sched/fair.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sched/fair.c linux-4.4.113-vs2.3.9.6/kernel/sched/fair.c
+--- linux-4.4.113/kernel/sched/fair.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sched/fair.c 2018-01-09 16:36:33.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
account_entity_dequeue(cfs_rq, se);
/*
-diff -NurpP --minimal linux-4.4.111/kernel/signal.c linux-4.4.111-vs2.3.9.5/kernel/signal.c
---- linux-4.4.111/kernel/signal.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/signal.c 2018-01-11 08:03:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sched/loadavg.c linux-4.4.113-vs2.3.9.6/kernel/sched/loadavg.c
+--- linux-4.4.113/kernel/sched/loadavg.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sched/loadavg.c 2018-01-24 23:01:30.000000000 +0000
+@@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem
+ */
+ void get_avenrun(unsigned long *loads, unsigned long offset, int shift)
+ {
+- loads[0] = (avenrun[0] + offset) << shift;
+- loads[1] = (avenrun[1] + offset) << shift;
+- loads[2] = (avenrun[2] + offset) << shift;
++ if (vx_flags(VXF_VIRT_LOAD, 0)) {
++ struct vx_info *vxi = current_vx_info();
++ loads[0] = (vxi->cvirt.load[0] + offset) << shift;
++ loads[1] = (vxi->cvirt.load[1] + offset) << shift;
++ loads[2] = (vxi->cvirt.load[2] + offset) << shift;
++ } else {
++ loads[0] = (avenrun[0] + offset) << shift;
++ loads[1] = (avenrun[1] + offset) << shift;
++ loads[2] = (avenrun[2] + offset) << shift;
++ }
+ }
+
+ long calc_load_fold_active(struct rq *this_rq)
+diff -NurpP --minimal linux-4.4.113/kernel/signal.c linux-4.4.113-vs2.3.9.6/kernel/signal.c
+--- linux-4.4.113/kernel/signal.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/signal.c 2018-01-11 08:03:00.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/compat.h>
#include <linux/cn_proc.h>
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-4.4.111/kernel/softirq.c linux-4.4.111-vs2.3.9.5/kernel/softirq.c
---- linux-4.4.111/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/softirq.c linux-4.4.113-vs2.3.9.6/kernel/softirq.c
+--- linux-4.4.113/kernel/softirq.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/softirq.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/sys.c linux-4.4.111-vs2.3.9.5/kernel/sys.c
---- linux-4.4.111/kernel/sys.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sys.c linux-4.4.113-vs2.3.9.6/kernel/sys.c
+--- linux-4.4.113/kernel/sys.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sys.c 2018-01-09 17:00:36.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/cred.h>
return 0;
return -EPERM;
-diff -NurpP --minimal linux-4.4.111/kernel/sysctl.c linux-4.4.111-vs2.3.9.5/kernel/sysctl.c
---- linux-4.4.111/kernel/sysctl.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sysctl.c linux-4.4.113-vs2.3.9.6/kernel/sysctl.c
+--- linux-4.4.113/kernel/sysctl.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sysctl.c 2018-01-09 16:36:34.000000000 +0000
@@ -87,6 +87,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.4.111/kernel/sysctl_binary.c linux-4.4.111-vs2.3.9.5/kernel/sysctl_binary.c
---- linux-4.4.111/kernel/sysctl_binary.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/sysctl_binary.c linux-4.4.113-vs2.3.9.6/kernel/sysctl_binary.c
+--- linux-4.4.113/kernel/sysctl_binary.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/sysctl_binary.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/time/posix-timers.c linux-4.4.111-vs2.3.9.5/kernel/time/posix-timers.c
---- linux-4.4.111/kernel/time/posix-timers.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/time/posix-timers.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/time/posix-timers.c linux-4.4.113-vs2.3.9.6/kernel/time/posix-timers.c
+--- linux-4.4.113/kernel/time/posix-timers.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/time/posix-timers.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/time/time.c linux-4.4.111-vs2.3.9.5/kernel/time/time.c
---- linux-4.4.111/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/time/time.c linux-4.4.113-vs2.3.9.6/kernel/time/time.c
+--- linux-4.4.113/kernel/time/time.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/time/time.c 2018-01-09 16:36:34.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
return 0;
}
-diff -NurpP --minimal linux-4.4.111/kernel/time/timekeeping.c linux-4.4.111-vs2.3.9.5/kernel/time/timekeeping.c
---- linux-4.4.111/kernel/time/timekeeping.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/time/timekeeping.c linux-4.4.113-vs2.3.9.6/kernel/time/timekeeping.c
+--- linux-4.4.113/kernel/time/timekeeping.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/time/timekeeping.c 2018-01-09 17:02:47.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/stop_machine.h>
#include <linux/pvclock_gtod.h>
}
EXPORT_SYMBOL(ktime_get_raw_and_real_ts64);
-diff -NurpP --minimal linux-4.4.111/kernel/time/timer.c linux-4.4.111-vs2.3.9.5/kernel/time/timer.c
---- linux-4.4.111/kernel/time/timer.c 2018-01-11 07:57:52.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/time/timer.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/time/timer.c linux-4.4.113-vs2.3.9.6/kernel/time/timer.c
+--- linux-4.4.113/kernel/time/timer.c 2018-01-24 21:22:58.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/time/timer.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/user_namespace.c linux-4.4.111-vs2.3.9.5/kernel/user_namespace.c
---- linux-4.4.111/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/user_namespace.c linux-4.4.113-vs2.3.9.6/kernel/user_namespace.c
+--- linux-4.4.113/kernel/user_namespace.c 2016-07-05 04:12:39.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/user_namespace.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/utsname.c linux-4.4.111-vs2.3.9.5/kernel/utsname.c
---- linux-4.4.111/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/utsname.c linux-4.4.113-vs2.3.9.6/kernel/utsname.c
+--- linux-4.4.113/kernel/utsname.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/utsname.c 2018-01-09 16:36:34.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
kfree(ns);
}
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/Kconfig linux-4.4.111-vs2.3.9.5/kernel/vserver/Kconfig
---- linux-4.4.111/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/Kconfig linux-4.4.113-vs2.3.9.6/kernel/vserver/Kconfig
+--- linux-4.4.113/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/Kconfig 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
+ bool
+ default n
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/Makefile linux-4.4.111-vs2.3.9.5/kernel/vserver/Makefile
---- linux-4.4.111/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/Makefile linux-4.4.113-vs2.3.9.6/kernel/vserver/Makefile
+--- linux-4.4.113/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/Makefile 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/cacct.c linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct.c
---- linux-4.4.111/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct.c linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct.c
+--- linux-4.4.113/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/cacct_init.h linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct_init.h
---- linux-4.4.111/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_init.h
+--- linux-4.4.113/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,25 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/cacct_proc.h linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct_proc.h
---- linux-4.4.111/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cacct_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_proc.h
+--- linux-4.4.113/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cacct_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/context.c linux-4.4.111-vs2.3.9.5/kernel/vserver/context.c
---- linux-4.4.111/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/context.c linux-4.4.113-vs2.3.9.6/kernel/vserver/context.c
+--- linux-4.4.113/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/context.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/cvirt.c linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt.c
---- linux-4.4.111/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt.c linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt.c
+--- linux-4.4.113/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt.c 2018-01-09 22:27:39.000000000 +0000
@@ -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.4.111/kernel/vserver/cvirt_init.h linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt_init.h
---- linux-4.4.111/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_init.h
+--- linux-4.4.113/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_init.h 2018-01-09 22:16:00.000000000 +0000
@@ -0,0 +1,70 @@
+
+
+ return;
+}
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/cvirt_proc.h linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt_proc.h
---- linux-4.4.111/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/cvirt_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_proc.h
+--- linux-4.4.113/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/cvirt_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/debug.c linux-4.4.111-vs2.3.9.5/kernel/vserver/debug.c
---- linux-4.4.111/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/debug.c linux-4.4.113-vs2.3.9.6/kernel/vserver/debug.c
+--- linux-4.4.113/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/debug.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/device.c linux-4.4.111-vs2.3.9.5/kernel/vserver/device.c
---- linux-4.4.111/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/device.c linux-4.4.113-vs2.3.9.6/kernel/vserver/device.c
+--- linux-4.4.113/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/device.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/dlimit.c linux-4.4.111-vs2.3.9.5/kernel/vserver/dlimit.c
---- linux-4.4.111/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/dlimit.c linux-4.4.113-vs2.3.9.6/kernel/vserver/dlimit.c
+--- linux-4.4.113/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/dlimit.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/helper.c linux-4.4.111-vs2.3.9.5/kernel/vserver/helper.c
---- linux-4.4.111/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/helper.c linux-4.4.113-vs2.3.9.6/kernel/vserver/helper.c
+--- linux-4.4.113/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/helper.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/history.c linux-4.4.111-vs2.3.9.5/kernel/vserver/history.c
---- linux-4.4.111/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/history.c linux-4.4.113-vs2.3.9.6/kernel/vserver/history.c
+--- linux-4.4.113/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/history.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/inet.c linux-4.4.111-vs2.3.9.5/kernel/vserver/inet.c
---- linux-4.4.111/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/inet.c linux-4.4.113-vs2.3.9.6/kernel/vserver/inet.c
+--- linux-4.4.113/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/inet.c 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/init.c linux-4.4.111-vs2.3.9.5/kernel/vserver/init.c
---- linux-4.4.111/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/init.c linux-4.4.113-vs2.3.9.6/kernel/vserver/init.c
+--- linux-4.4.113/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/init.c 2018-01-09 22:31:39.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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.4.111/kernel/vserver/inode.c linux-4.4.111-vs2.3.9.5/kernel/vserver/inode.c
---- linux-4.4.111/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/inode.c linux-4.4.113-vs2.3.9.6/kernel/vserver/inode.c
+--- linux-4.4.113/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/inode.c 2018-01-09 22:24:56.000000000 +0000
@@ -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.4.111/kernel/vserver/limit.c linux-4.4.111-vs2.3.9.5/kernel/vserver/limit.c
---- linux-4.4.111/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/limit.c 2018-01-09 16:36:34.000000000 +0000
-@@ -0,0 +1,343 @@
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit.c linux-4.4.113-vs2.3.9.6/kernel/vserver/limit.c
+--- linux-4.4.113/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit.c 2018-01-24 23:13:15.000000000 +0000
+@@ -0,0 +1,386 @@
+/*
+ * 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
+
+
+#ifdef CONFIG_MEMCG
++
++void dump_sysinfo(struct sysinfo *si)
++{
++ printk(KERN_INFO "sysinfo: memunit=%u\n"
++ "\ttotalram:\t%lu\n"
++ "\tfreeram:\t%lu\n"
++ "\tsharedram:\t%lu\n"
++ "\tbufferram:\t%lu\n"
++ "\ttotalswap:\t%lu\n"
++ "\tfreeswap:\t%lu\n"
++ "\ttotalhigh:\t%lu\n"
++ "\tfreehigh:\t%lu\n",
++ si->mem_unit,
++ si->totalram,
++ si->freeram,
++ si->sharedram,
++ si->bufferram,
++ si->totalswap,
++ si->freeswap,
++ si->totalhigh,
++ si->freehigh);
++}
++
+void vx_vsi_meminfo(struct sysinfo *val)
+{
+ struct mem_cgroup *mcg;
-+ u64 res_limit, res_usage;
++ unsigned long res_limit, res_usage;
++ unsigned shift;
++
++ if (VXD_CBIT(cvirt, 4))
++ dump_sysinfo(val);
+
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
++ if (VXD_CBIT(cvirt, 5))
++ dump_mem_cgroup(mcg);
+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+
+ res_limit = mem_cgroup_mem_limit_pages(mcg);
+ res_usage = mem_cgroup_mem_usage_pages(mcg);
++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
+
+ if (res_limit != PAGE_COUNTER_MAX)
-+ val->totalram = res_limit;
-+ val->freeram = val->totalram - res_usage;
++ val->totalram = res_limit << shift;
++ val->freeram = val->totalram - (res_usage << shift);
+ val->bufferram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
+{
+#ifdef CONFIG_MEMCG_SWAP
+ struct mem_cgroup *mcg;
-+ u64 res_limit, res_usage, memsw_limit, memsw_usage;
-+ s64 swap_limit, swap_usage;
++ unsigned long res_limit, res_usage, memsw_limit, memsw_usage;
++ signed long swap_limit, swap_usage;
++ unsigned shift;
++
++ if (VXD_CBIT(cvirt, 6))
++ dump_sysinfo(val);
+
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
++ if (VXD_CBIT(cvirt, 7))
++ dump_mem_cgroup(mcg);
+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+
+ res_limit = mem_cgroup_mem_limit_pages(mcg);
-+ res_usage = mem_cgroup_mem_usage_pages(mcg);
-+ memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
-+ memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
+
+ /* memory unlimited */
+ if (res_limit == PAGE_COUNTER_MAX)
+ goto out;
+
++ res_usage = mem_cgroup_mem_usage_pages(mcg);
++ memsw_limit = mem_cgroup_memsw_limit_pages(mcg);
++ memsw_usage = mem_cgroup_memsw_usage_pages(mcg);
++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0;
++
+ swap_limit = memsw_limit - res_limit;
+ /* we have a swap limit? */
+ if (memsw_limit != PAGE_COUNTER_MAX)
-+ val->totalswap = swap_limit;
++ val->totalswap = swap_limit << shift;
+
+ /* calculate swap part */
+ swap_usage = (memsw_usage > res_usage) ?
+
+ /* total shown minus usage gives free swap */
+ val->freeswap = (swap_usage < swap_limit) ?
-+ val->totalswap - swap_usage : 0;
++ val->totalswap - (swap_usage << shift) : 0;
+out:
+#else /* !CONFIG_MEMCG_SWAP */
+ val->totalswap = 0;
+#ifdef CONFIG_MEMCG_BROKEN
+ struct mem_cgroup *mcg;
+
++ if (VXD_CBIT(cvirt, 8))
++ dump_sysinfo(val);
++
+ rcu_read_lock();
+ mcg = mem_cgroup_from_task(current);
++ if (VXD_CBIT(cvirt, 9))
++ dump_mem_cgroup(mcg);
+ rcu_read_unlock();
+ if (!mcg)
+ goto out;
+}
+#endif /* !CONFIG_MEMCG */
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/limit_init.h linux-4.4.111-vs2.3.9.5/kernel/vserver/limit_init.h
---- linux-4.4.111/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_init.h
+--- linux-4.4.113/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,31 @@
+
+
+ }
+}
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/limit_proc.h linux-4.4.111-vs2.3.9.5/kernel/vserver/limit_proc.h
---- linux-4.4.111/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/limit_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_proc.h
+--- linux-4.4.113/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/limit_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/network.c linux-4.4.111-vs2.3.9.5/kernel/vserver/network.c
---- linux-4.4.111/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/network.c linux-4.4.113-vs2.3.9.6/kernel/vserver/network.c
+--- linux-4.4.113/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/network.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/proc.c linux-4.4.111-vs2.3.9.5/kernel/vserver/proc.c
---- linux-4.4.111/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/proc.c 2018-01-11 12:02:42.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/proc.c linux-4.4.113-vs2.3.9.6/kernel/vserver/proc.c
+--- linux-4.4.113/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/proc.c 2018-01-11 12:02:42.000000000 +0000
@@ -0,0 +1,1040 @@
+/*
+ * 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.4.111/kernel/vserver/sched.c linux-4.4.111-vs2.3.9.5/kernel/vserver/sched.c
---- linux-4.4.111/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched.c linux-4.4.113-vs2.3.9.6/kernel/vserver/sched.c
+--- linux-4.4.113/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/sched_init.h linux-4.4.111-vs2.3.9.5/kernel/vserver/sched_init.h
---- linux-4.4.111/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_init.h linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_init.h
+--- linux-4.4.113/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_init.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
+{
+ return;
+}
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/sched_proc.h linux-4.4.111-vs2.3.9.5/kernel/vserver/sched_proc.h
---- linux-4.4.111/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/sched_proc.h linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_proc.h
+--- linux-4.4.113/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sched_proc.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-4.4.111/kernel/vserver/signal.c linux-4.4.111-vs2.3.9.5/kernel/vserver/signal.c
---- linux-4.4.111/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/signal.c linux-4.4.113-vs2.3.9.6/kernel/vserver/signal.c
+--- linux-4.4.113/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/signal.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/space.c linux-4.4.111-vs2.3.9.5/kernel/vserver/space.c
---- linux-4.4.111/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/space.c linux-4.4.113-vs2.3.9.6/kernel/vserver/space.c
+--- linux-4.4.113/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/space.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/switch.c linux-4.4.111-vs2.3.9.5/kernel/vserver/switch.c
---- linux-4.4.111/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/switch.c linux-4.4.113-vs2.3.9.6/kernel/vserver/switch.c
+--- linux-4.4.113/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/switch.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/sysctl.c linux-4.4.111-vs2.3.9.5/kernel/vserver/sysctl.c
---- linux-4.4.111/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/sysctl.c linux-4.4.113-vs2.3.9.6/kernel/vserver/sysctl.c
+--- linux-4.4.113/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/sysctl.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/tag.c linux-4.4.111-vs2.3.9.5/kernel/vserver/tag.c
---- linux-4.4.111/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/tag.c linux-4.4.113-vs2.3.9.6/kernel/vserver/tag.c
+--- linux-4.4.113/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/tag.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/kernel/vserver/vci_config.h linux-4.4.111-vs2.3.9.5/kernel/vserver/vci_config.h
---- linux-4.4.111/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/kernel/vserver/vci_config.h linux-4.4.113-vs2.3.9.6/kernel/vserver/vci_config.h
+--- linux-4.4.113/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/kernel/vserver/vci_config.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
+ 0;
+}
+
-diff -NurpP --minimal linux-4.4.111/mm/memcontrol.c linux-4.4.111-vs2.3.9.5/mm/memcontrol.c
---- linux-4.4.111/mm/memcontrol.c 2018-01-11 07:57:53.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/memcontrol.c 2018-01-09 16:36:34.000000000 +0000
-@@ -2888,6 +2888,28 @@ static u64 mem_cgroup_read_u64(struct cg
+diff -NurpP --minimal linux-4.4.113/mm/memcontrol.c linux-4.4.113-vs2.3.9.6/mm/memcontrol.c
+--- linux-4.4.113/mm/memcontrol.c 2018-01-24 21:22:59.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/memcontrol.c 2018-01-24 22:25:34.000000000 +0000
+@@ -2888,6 +2888,42 @@ static u64 mem_cgroup_read_u64(struct cg
}
}
-+u64 mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
++unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg)
+{
-+ return mem_cgroup_usage(memcg, false) >> PAGE_SHIFT;
++ return mem_cgroup_usage(memcg, false);
+}
+
-+u64 mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
++unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg)
+{
+ return (u64)memcg->memory.limit;
+}
+
-+u64 mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
++unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg)
+{
-+ return mem_cgroup_usage(memcg, true) >> PAGE_SHIFT;
++ return mem_cgroup_usage(memcg, true);
+}
+
-+u64 mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
++unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg)
+{
+ return (u64)memcg->memsw.limit;
+}
+
++void dump_mem_cgroup(struct mem_cgroup *memcg)
++{
++ printk(KERN_INFO "memcg: %p/%d:\n"
++ "\tmemory:\t%lu/%lu %lu/%lu\n"
++ "\tmemsw:\t%lu/%lu %lu/%lu\n"
++ "\tkmem:\t%lu/%lu %lu/%lu\n",
++ memcg, memcg->id.id,
++ page_counter_read(&memcg->memory), memcg->memory.limit,
++ memcg->memory.watermark, memcg->memory.failcnt,
++ page_counter_read(&memcg->memsw), memcg->memsw.limit,
++ memcg->memsw.watermark, memcg->memsw.failcnt,
++ page_counter_read(&memcg->kmem), memcg->kmem.limit,
++ memcg->kmem.watermark, memcg->kmem.failcnt);
++}
+
+
#ifdef CONFIG_MEMCG_KMEM
static int memcg_activate_kmem(struct mem_cgroup *memcg,
unsigned long nr_pages)
-diff -NurpP --minimal linux-4.4.111/mm/oom_kill.c linux-4.4.111-vs2.3.9.5/mm/oom_kill.c
---- linux-4.4.111/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/oom_kill.c linux-4.4.113-vs2.3.9.6/mm/oom_kill.c
+--- linux-4.4.113/mm/oom_kill.c 2016-07-05 04:15:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/oom_kill.c 2018-01-09 16:56:23.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
}
if (p && p != (void *)-1UL) {
oom_kill_process(oc, p, points, totalpages, NULL,
-diff -NurpP --minimal linux-4.4.111/mm/page_alloc.c linux-4.4.111-vs2.3.9.5/mm/page_alloc.c
---- linux-4.4.111/mm/page_alloc.c 2018-01-11 07:57:53.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/page_alloc.c 2018-01-09 16:57:52.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/page_alloc.c linux-4.4.113-vs2.3.9.6/mm/page_alloc.c
+--- linux-4.4.113/mm/page_alloc.c 2018-01-24 21:22:59.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/page_alloc.c 2018-01-09 16:57:52.000000000 +0000
@@ -62,6 +62,8 @@
#include <linux/sched/rt.h>
#include <linux/page_owner.h>
}
#endif
-diff -NurpP --minimal linux-4.4.111/mm/pgtable-generic.c linux-4.4.111-vs2.3.9.5/mm/pgtable-generic.c
---- linux-4.4.111/mm/pgtable-generic.c 2018-01-11 07:57:53.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/pgtable-generic.c linux-4.4.113-vs2.3.9.6/mm/pgtable-generic.c
+--- linux-4.4.113/mm/pgtable-generic.c 2018-01-24 21:22:59.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/pgtable-generic.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/mm/shmem.c linux-4.4.111-vs2.3.9.5/mm/shmem.c
---- linux-4.4.111/mm/shmem.c 2018-01-11 07:57:53.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/shmem.c linux-4.4.113-vs2.3.9.6/mm/shmem.c
+--- linux-4.4.113/mm/shmem.c 2018-01-24 21:22:59.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/shmem.c 2018-01-09 16:36:34.000000000 +0000
@@ -2198,7 +2198,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.4.111/mm/slab.c linux-4.4.111-vs2.3.9.5/mm/slab.c
---- linux-4.4.111/mm/slab.c 2016-07-05 04:15:13.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/slab.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/slab.c linux-4.4.113-vs2.3.9.6/mm/slab.c
+--- linux-4.4.113/mm/slab.c 2016-07-05 04:15:13.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/slab.c 2018-01-09 16:36:34.000000000 +0000
@@ -337,6 +337,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.4.111/mm/slab_vs.h linux-4.4.111-vs2.3.9.5/mm/slab_vs.h
---- linux-4.4.111/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/slab_vs.h linux-4.4.113-vs2.3.9.6/mm/slab_vs.h
+--- linux-4.4.113/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/slab_vs.h 2018-01-09 16:36:34.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-4.4.111/mm/swapfile.c linux-4.4.111-vs2.3.9.5/mm/swapfile.c
---- linux-4.4.111/mm/swapfile.c 2018-01-11 07:57:53.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/mm/swapfile.c linux-4.4.113-vs2.3.9.6/mm/swapfile.c
+--- linux-4.4.113/mm/swapfile.c 2018-01-24 21:22:59.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/mm/swapfile.c 2018-01-09 16:36:34.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
}
/*
-diff -NurpP --minimal linux-4.4.111/net/bridge/br_multicast.c linux-4.4.111-vs2.3.9.5/net/bridge/br_multicast.c
---- linux-4.4.111/net/bridge/br_multicast.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/bridge/br_multicast.c linux-4.4.113-vs2.3.9.6/net/bridge/br_multicast.c
+--- linux-4.4.113/net/bridge/br_multicast.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/bridge/br_multicast.c 2018-01-09 16:36:34.000000000 +0000
@@ -462,7 +462,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
kfree_skb(skb);
br->has_ipv6_addr = 0;
return NULL;
-diff -NurpP --minimal linux-4.4.111/net/core/dev.c linux-4.4.111-vs2.3.9.5/net/core/dev.c
---- linux-4.4.111/net/core/dev.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/core/dev.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/core/dev.c linux-4.4.113-vs2.3.9.6/net/core/dev.c
+--- linux-4.4.113/net/core/dev.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/core/dev.c 2018-01-09 16:36:34.000000000 +0000
@@ -124,6 +124,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.4.111/net/core/net-procfs.c linux-4.4.111-vs2.3.9.5/net/core/net-procfs.c
---- linux-4.4.111/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/core/net-procfs.c linux-4.4.113-vs2.3.9.6/net/core/net-procfs.c
+--- linux-4.4.113/net/core/net-procfs.c 2015-04-12 22:12:50.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/core/net-procfs.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/core/rtnetlink.c linux-4.4.111-vs2.3.9.5/net/core/rtnetlink.c
---- linux-4.4.111/net/core/rtnetlink.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/core/rtnetlink.c linux-4.4.113-vs2.3.9.6/net/core/rtnetlink.c
+--- linux-4.4.113/net/core/rtnetlink.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/core/rtnetlink.c 2018-01-09 16:36:34.000000000 +0000
@@ -1456,6 +1456,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.4.111/net/core/sock.c linux-4.4.111-vs2.3.9.5/net/core/sock.c
---- linux-4.4.111/net/core/sock.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/core/sock.c linux-4.4.113-vs2.3.9.6/net/core/sock.c
+--- linux-4.4.113/net/core/sock.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/core/sock.c 2018-01-09 17:15:58.000000000 +0000
@@ -134,6 +134,10 @@
#include <linux/sock_diag.h>
#ifdef CONFIG_NET_RX_BUSY_POLL
sk->sk_napi_id = 0;
sk->sk_ll_usec = sysctl_net_busy_read;
-diff -NurpP --minimal linux-4.4.111/net/ipv4/af_inet.c linux-4.4.111-vs2.3.9.5/net/ipv4/af_inet.c
---- linux-4.4.111/net/ipv4/af_inet.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/af_inet.c linux-4.4.113-vs2.3.9.6/net/ipv4/af_inet.c
+--- linux-4.4.113/net/ipv4/af_inet.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/af_inet.c 2018-01-09 17:11:11.000000000 +0000
@@ -308,10 +308,15 @@ lookup_protocol:
}
const struct proto_ops inet_stream_ops = {
.family = PF_INET,
-diff -NurpP --minimal linux-4.4.111/net/ipv4/arp.c linux-4.4.111-vs2.3.9.5/net/ipv4/arp.c
---- linux-4.4.111/net/ipv4/arp.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/arp.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/arp.c linux-4.4.113-vs2.3.9.6/net/ipv4/arp.c
+--- linux-4.4.113/net/ipv4/arp.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/arp.c 2018-01-09 16:36:34.000000000 +0000
@@ -1290,6 +1290,7 @@ static void arp_format_neigh_entry(struc
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.4.111/net/ipv4/devinet.c linux-4.4.111-vs2.3.9.5/net/ipv4/devinet.c
---- linux-4.4.111/net/ipv4/devinet.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/devinet.c linux-4.4.113-vs2.3.9.6/net/ipv4/devinet.c
+--- linux-4.4.113/net/ipv4/devinet.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/devinet.c 2018-01-09 16:36:34.000000000 +0000
@@ -538,6 +538,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.4.111/net/ipv4/fib_trie.c linux-4.4.111-vs2.3.9.5/net/ipv4/fib_trie.c
---- linux-4.4.111/net/ipv4/fib_trie.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/fib_trie.c linux-4.4.113-vs2.3.9.6/net/ipv4/fib_trie.c
+--- linux-4.4.113/net/ipv4/fib_trie.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/fib_trie.c 2018-01-09 16:36:34.000000000 +0000
@@ -2591,6 +2591,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.4.111/net/ipv4/inet_connection_sock.c linux-4.4.111-vs2.3.9.5/net/ipv4/inet_connection_sock.c
---- linux-4.4.111/net/ipv4/inet_connection_sock.c 2018-01-11 07:57:54.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_connection_sock.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_connection_sock.c
+--- linux-4.4.113/net/ipv4/inet_connection_sock.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_connection_sock.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv4/inet_diag.c linux-4.4.111-vs2.3.9.5/net/ipv4/inet_diag.c
---- linux-4.4.111/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_diag.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_diag.c
+--- linux-4.4.113/net/ipv4/inet_diag.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_diag.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv4/inet_hashtables.c linux-4.4.111-vs2.3.9.5/net/ipv4/inet_hashtables.c
---- linux-4.4.111/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/inet_hashtables.c linux-4.4.113-vs2.3.9.6/net/ipv4/inet_hashtables.c
+--- linux-4.4.113/net/ipv4/inet_hashtables.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/inet_hashtables.c 2018-01-09 16:36:34.000000000 +0000
@@ -23,6 +23,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.4.111/net/ipv4/netfilter.c linux-4.4.111-vs2.3.9.5/net/ipv4/netfilter.c
---- linux-4.4.111/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/netfilter.c linux-4.4.113-vs2.3.9.6/net/ipv4/netfilter.c
+--- linux-4.4.113/net/ipv4/netfilter.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/netfilter.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv4/raw.c linux-4.4.111-vs2.3.9.5/net/ipv4/raw.c
---- linux-4.4.111/net/ipv4/raw.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/raw.c linux-4.4.113-vs2.3.9.6/net/ipv4/raw.c
+--- linux-4.4.113/net/ipv4/raw.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/raw.c 2018-01-09 17:06:10.000000000 +0000
@@ -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.4.111/net/ipv4/route.c linux-4.4.111-vs2.3.9.5/net/ipv4/route.c
---- linux-4.4.111/net/ipv4/route.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/route.c linux-4.4.113-vs2.3.9.6/net/ipv4/route.c
+--- linux-4.4.113/net/ipv4/route.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/route.c 2018-01-09 16:36:34.000000000 +0000
@@ -2226,7 +2226,7 @@ struct rtable *__ip_route_output_key_has
rth = ERR_PTR(-ENODEV);
if (!dev_out)
goto out;
-diff -NurpP --minimal linux-4.4.111/net/ipv4/tcp.c linux-4.4.111-vs2.3.9.5/net/ipv4/tcp.c
---- linux-4.4.111/net/ipv4/tcp.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/tcp.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp.c
+--- linux-4.4.113/net/ipv4/tcp.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv4/tcp_ipv4.c linux-4.4.111-vs2.3.9.5/net/ipv4/tcp_ipv4.c
---- linux-4.4.111/net/ipv4/tcp_ipv4.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_ipv4.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_ipv4.c
+--- linux-4.4.113/net/ipv4/tcp_ipv4.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_ipv4.c 2018-01-09 17:13:45.000000000 +0000
@@ -1885,6 +1885,10 @@ static void *listening_get_next(struct s
sk = sk_nulls_next(sk);
get_sk:
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-4.4.111/net/ipv4/tcp_minisocks.c linux-4.4.111-vs2.3.9.5/net/ipv4/tcp_minisocks.c
---- linux-4.4.111/net/ipv4/tcp_minisocks.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/tcp_minisocks.c linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_minisocks.c
+--- linux-4.4.113/net/ipv4/tcp_minisocks.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/tcp_minisocks.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv4/udp.c linux-4.4.111-vs2.3.9.5/net/ipv4/udp.c
---- linux-4.4.111/net/ipv4/udp.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv4/udp.c linux-4.4.113-vs2.3.9.6/net/ipv4/udp.c
+--- linux-4.4.113/net/ipv4/udp.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv4/udp.c 2018-01-09 16:36:34.000000000 +0000
@@ -309,14 +309,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.4.111/net/ipv6/addrconf.c linux-4.4.111-vs2.3.9.5/net/ipv6/addrconf.c
---- linux-4.4.111/net/ipv6/addrconf.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/addrconf.c linux-4.4.113-vs2.3.9.6/net/ipv6/addrconf.c
+--- linux-4.4.113/net/ipv6/addrconf.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/addrconf.c 2018-01-09 23:41:55.000000000 +0000
@@ -92,6 +92,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-4.4.111/net/ipv6/af_inet6.c linux-4.4.111-vs2.3.9.5/net/ipv6/af_inet6.c
---- linux-4.4.111/net/ipv6/af_inet6.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/af_inet6.c linux-4.4.113-vs2.3.9.6/net/ipv6/af_inet6.c
+--- linux-4.4.113/net/ipv6/af_inet6.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/af_inet6.c 2018-01-09 16:36:34.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
if (ipv6_addr_any(&sk->sk_v6_rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-4.4.111/net/ipv6/datagram.c linux-4.4.111-vs2.3.9.5/net/ipv6/datagram.c
---- linux-4.4.111/net/ipv6/datagram.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/datagram.c linux-4.4.113-vs2.3.9.6/net/ipv6/datagram.c
+--- linux-4.4.113/net/ipv6/datagram.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/datagram.c 2018-01-09 16:36:34.000000000 +0000
@@ -733,7 +733,7 @@ int ip6_datagram_send_ctl(struct net *ne
rcu_read_lock();
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-4.4.111/net/ipv6/fib6_rules.c linux-4.4.111-vs2.3.9.5/net/ipv6/fib6_rules.c
---- linux-4.4.111/net/ipv6/fib6_rules.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/fib6_rules.c linux-4.4.113-vs2.3.9.6/net/ipv6/fib6_rules.c
+--- linux-4.4.113/net/ipv6/fib6_rules.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/fib6_rules.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv6/inet6_hashtables.c linux-4.4.111-vs2.3.9.5/net/ipv6/inet6_hashtables.c
---- linux-4.4.111/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/inet6_hashtables.c linux-4.4.113-vs2.3.9.6/net/ipv6/inet6_hashtables.c
+--- linux-4.4.113/net/ipv6/inet6_hashtables.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/inet6_hashtables.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv6/ip6_fib.c linux-4.4.111-vs2.3.9.5/net/ipv6/ip6_fib.c
---- linux-4.4.111/net/ipv6/ip6_fib.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_fib.c linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_fib.c
+--- linux-4.4.113/net/ipv6/ip6_fib.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_fib.c 2018-01-09 16:36:34.000000000 +0000
@@ -1968,6 +1968,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.4.111/net/ipv6/ip6_output.c linux-4.4.111-vs2.3.9.5/net/ipv6/ip6_output.c
---- linux-4.4.111/net/ipv6/ip6_output.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/ip6_output.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/ip6_output.c linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_output.c
+--- linux-4.4.113/net/ipv6/ip6_output.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/ip6_output.c 2018-01-25 00:25:03.000000000 +0000
@@ -941,7 +941,8 @@ static int ip6_dst_lookup_tail(struct ne
rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
if (err)
goto out_err_release;
-diff -NurpP --minimal linux-4.4.111/net/ipv6/ndisc.c linux-4.4.111-vs2.3.9.5/net/ipv6/ndisc.c
---- linux-4.4.111/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/ndisc.c linux-4.4.113-vs2.3.9.6/net/ipv6/ndisc.c
+--- linux-4.4.113/net/ipv6/ndisc.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/ndisc.c 2018-01-09 16:36:34.000000000 +0000
@@ -501,7 +501,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.4.111/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.111-vs2.3.9.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
---- linux-4.4.111/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.4.113-vs2.3.9.6/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
+--- linux-4.4.113/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2018-01-09 17:04:44.000000000 +0000
@@ -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.4.111/net/ipv6/raw.c linux-4.4.111-vs2.3.9.5/net/ipv6/raw.c
---- linux-4.4.111/net/ipv6/raw.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/raw.c linux-4.4.113-vs2.3.9.6/net/ipv6/raw.c
+--- linux-4.4.113/net/ipv6/raw.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/raw.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv6/route.c linux-4.4.111-vs2.3.9.5/net/ipv6/route.c
---- linux-4.4.111/net/ipv6/route.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/route.c linux-4.4.113-vs2.3.9.6/net/ipv6/route.c
+--- linux-4.4.113/net/ipv6/route.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/route.c 2018-01-09 17:03:24.000000000 +0000
@@ -62,6 +62,7 @@
#include <net/lwtunnel.h>
#include <net/ip_tunnels.h>
nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf))
goto nla_put_failure;
}
-diff -NurpP --minimal linux-4.4.111/net/ipv6/tcp_ipv6.c linux-4.4.111-vs2.3.9.5/net/ipv6/tcp_ipv6.c
---- linux-4.4.111/net/ipv6/tcp_ipv6.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/tcp_ipv6.c linux-4.4.113-vs2.3.9.6/net/ipv6/tcp_ipv6.c
+--- linux-4.4.113/net/ipv6/tcp_ipv6.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/tcp_ipv6.c 2018-01-09 16:36:34.000000000 +0000
@@ -69,6 +69,7 @@
#include <linux/crypto.h>
}
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-4.4.111/net/ipv6/udp.c linux-4.4.111-vs2.3.9.5/net/ipv6/udp.c
---- linux-4.4.111/net/ipv6/udp.c 2018-01-11 07:57:55.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/udp.c linux-4.4.113-vs2.3.9.6/net/ipv6/udp.c
+--- linux-4.4.113/net/ipv6/udp.c 2018-01-24 21:23:00.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/udp.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/ipv6/xfrm6_policy.c linux-4.4.111-vs2.3.9.5/net/ipv6/xfrm6_policy.c
---- linux-4.4.111/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/ipv6/xfrm6_policy.c linux-4.4.113-vs2.3.9.6/net/ipv6/xfrm6_policy.c
+--- linux-4.4.113/net/ipv6/xfrm6_policy.c 2016-07-05 04:15:14.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/ipv6/xfrm6_policy.c 2018-01-09 16:36:34.000000000 +0000
@@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n
return -EHOSTUNREACH;
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-4.4.111/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.111-vs2.3.9.5/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-4.4.111/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/netfilter/ipvs/ip_vs_xmit.c linux-4.4.113-vs2.3.9.6/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-4.4.113/net/netfilter/ipvs/ip_vs_xmit.c 2016-07-05 04:15:15.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/netfilter/ipvs/ip_vs_xmit.c 2018-01-09 16:36:34.000000000 +0000
@@ -381,7 +381,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.4.111/net/netlink/af_netlink.c linux-4.4.111-vs2.3.9.5/net/netlink/af_netlink.c
---- linux-4.4.111/net/netlink/af_netlink.c 2018-01-11 07:57:56.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/netlink/af_netlink.c linux-4.4.113-vs2.3.9.6/net/netlink/af_netlink.c
+--- linux-4.4.113/net/netlink/af_netlink.c 2018-01-24 21:23:01.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/netlink/af_netlink.c 2018-01-09 16:36:34.000000000 +0000
@@ -62,6 +62,8 @@
#include <asm/cacheflush.h>
#include <linux/hash.h>
return nlk;
}
-diff -NurpP --minimal linux-4.4.111/net/socket.c linux-4.4.111-vs2.3.9.5/net/socket.c
---- linux-4.4.111/net/socket.c 2018-01-11 07:57:56.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/socket.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/socket.c linux-4.4.113-vs2.3.9.6/net/socket.c
+--- linux-4.4.113/net/socket.c 2018-01-24 21:23:01.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/socket.c 2018-01-09 16:36:34.000000000 +0000
@@ -99,10 +99,12 @@
#include <net/sock.h>
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-4.4.111/net/sunrpc/auth.c linux-4.4.111-vs2.3.9.5/net/sunrpc/auth.c
---- linux-4.4.111/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth.c linux-4.4.113-vs2.3.9.6/net/sunrpc/auth.c
+--- linux-4.4.113/net/sunrpc/auth.c 2015-10-29 09:21:46.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/sunrpc/auth.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/sunrpc/auth_unix.c linux-4.4.111-vs2.3.9.5/net/sunrpc/auth_unix.c
---- linux-4.4.111/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/sunrpc/auth_unix.c linux-4.4.113-vs2.3.9.6/net/sunrpc/auth_unix.c
+--- linux-4.4.113/net/sunrpc/auth_unix.c 2016-07-05 04:12:45.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/sunrpc/auth_unix.c 2018-01-09 16:36:34.000000000 +0000
@@ -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.4.111/net/sunrpc/clnt.c linux-4.4.111-vs2.3.9.5/net/sunrpc/clnt.c
---- linux-4.4.111/net/sunrpc/clnt.c 2018-01-11 07:57:57.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/sunrpc/clnt.c linux-4.4.113-vs2.3.9.6/net/sunrpc/clnt.c
+--- linux-4.4.113/net/sunrpc/clnt.c 2018-01-24 21:23:01.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/sunrpc/clnt.c 2018-01-09 16:36:34.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in.h>
#include <linux/in6.h>
return clnt;
}
-diff -NurpP --minimal linux-4.4.111/net/unix/af_unix.c linux-4.4.111-vs2.3.9.5/net/unix/af_unix.c
---- linux-4.4.111/net/unix/af_unix.c 2018-01-11 07:57:57.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/net/unix/af_unix.c linux-4.4.113-vs2.3.9.6/net/unix/af_unix.c
+--- linux-4.4.113/net/unix/af_unix.c 2018-01-24 21:23:02.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/net/unix/af_unix.c 2018-01-09 16:36:34.000000000 +0000
@@ -117,6 +117,8 @@
#include <net/checksum.h>
#include <linux/security.h>
if (sock_net(sk) == seq_file_net(seq))
return sk;
}
-diff -NurpP --minimal linux-4.4.111/scripts/checksyscalls.sh linux-4.4.111-vs2.3.9.5/scripts/checksyscalls.sh
---- linux-4.4.111/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/scripts/checksyscalls.sh linux-4.4.113-vs2.3.9.6/scripts/checksyscalls.sh
+--- linux-4.4.113/scripts/checksyscalls.sh 2015-10-29 09:21:46.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/scripts/checksyscalls.sh 2018-01-09 16:36:34.000000000 +0000
@@ -196,7 +196,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
EOF
}
-diff -NurpP --minimal linux-4.4.111/security/commoncap.c linux-4.4.111-vs2.3.9.5/security/commoncap.c
---- linux-4.4.111/security/commoncap.c 2018-01-11 07:57:57.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/security/commoncap.c linux-4.4.113-vs2.3.9.6/security/commoncap.c
+--- linux-4.4.113/security/commoncap.c 2018-01-24 21:23:02.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/security/commoncap.c 2018-01-09 16:36:34.000000000 +0000
@@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed(
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-4.4.111/security/selinux/hooks.c linux-4.4.111-vs2.3.9.5/security/selinux/hooks.c
---- linux-4.4.111/security/selinux/hooks.c 2018-01-11 07:57:57.000000000 +0000
-+++ linux-4.4.111-vs2.3.9.5/security/selinux/hooks.c 2018-01-09 16:36:34.000000000 +0000
+diff -NurpP --minimal linux-4.4.113/security/selinux/hooks.c linux-4.4.113-vs2.3.9.6/security/selinux/hooks.c
+--- linux-4.4.113/security/selinux/hooks.c 2018-01-24 21:23:02.000000000 +0000
++++ linux-4.4.113-vs2.3.9.6/security/selinux/hooks.c 2018-01-09 16:36:34.000000000 +0000
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>
projects / packages / kernel.git / commitdiff