summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/linux-vserver/APKBUILD18
-rw-r--r--main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff (renamed from main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff)2424
2 files changed, 1220 insertions, 1222 deletions
diff --git a/main/linux-vserver/APKBUILD b/main/linux-vserver/APKBUILD
index be32d6f15..7a01bbcc3 100644
--- a/main/linux-vserver/APKBUILD
+++ b/main/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
_flavor=vserver
pkgname=linux-${_flavor}
-pkgver=3.10.19
+pkgver=3.10.23
pkgrel=0
_vsver=vs2.3.6.8
@@ -23,7 +23,6 @@ source="http://www.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
http://www.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
patch-$pkgver-$_vsver.diff
aslr-pie.patch
- CVE-2013-4348.patch
kernelconfig.x86
kernelconfig.x86_64
"
@@ -138,23 +137,20 @@ dev() {
}
md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz
-b7f932eecbbf5636ad69add480fa1573 patch-3.10.19.xz
-16269e10835d0f8446e8b5e0016c87bf patch-3.10.19-vs2.3.6.8.diff
+8b9650e10f8beee769545b51202766a5 patch-3.10.23.xz
+5cf351f296b0343a244cbfb11b6620f8 patch-3.10.23-vs2.3.6.8.diff
35e2e5c7a5f0de3cdf540bb4ae894349 aslr-pie.patch
-09ae7985af988c75ff35ed503558eb8b CVE-2013-4348.patch
7f62c6c40c9638d83d4fa11eace3f9ac kernelconfig.x86
aa2ac10901c87db6a4a70ed3d8cc49a8 kernelconfig.x86_64"
sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz
-c420b1da0aefe23e4a6953e579374fd377385b6041f967694cf4f828e2f3252e patch-3.10.19.xz
-56247228dc90b9dfe162f4ad704863f3d8bd713a16f81e885a0338c963df94ec patch-3.10.19-vs2.3.6.8.diff
+bdf3983ff3e26c5781edb19a8d0d7765e2e0282cfabda2b0652cc0deff53f445 patch-3.10.23.xz
+48abc596ffbca06766ac308743c5882d1666c9fa7e6b96e349cc73eb1f75e000 patch-3.10.23-vs2.3.6.8.diff
c18b47c7cd07837ca1c4f4702ef72e688a307b02f1f74012b329cea7d910ec85 aslr-pie.patch
-39acdfc0bb2298e3a9ba62ee42ac2b6556fc31d8eaa2c085f84897cdeaa1a996 CVE-2013-4348.patch
1c06446173692d14e7db21b873e6b9053770ed1290a0e199e575dfebd2781072 kernelconfig.x86
ed941323278a48033f96cdfd4e66a25cb26171b31cbc96583817f7291d47f721 kernelconfig.x86_64"
sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz
-6a8bfb124f90f1c8ed27ce3315629601b1b72d4bc8b1d2b776424e56b3a72e4cd03bcebe6cde35223a3beba75ec6d69e949e217504acc611becb7e62aa88f05c patch-3.10.19.xz
-9e6ed233e4618d9a9368d907631b9643f91e42fac1115f50f3e57deeea946f0d8673f82f92ed134bc2b1ca4ba7198dae9327b3f157673f21bab73e5a46bee79f patch-3.10.19-vs2.3.6.8.diff
+0fdb65f1c45e490e1f2206589273e4b8f0f142ab6b16341cb52977e0c6a983b359f01456a9cae3e1c139d5ead5de106c10909b7fdb6a156675cad5d39374e97f patch-3.10.23.xz
+01ec1135de900f898fd8aa61d6d3475a64bcd1dfdbcda6747cd5132b7bb12f195331995ae52e718108ef118e6bd1a50984f861a6318346317ad6401117beff2a patch-3.10.23-vs2.3.6.8.diff
41c74619359791a65dc2c017e8fdae9e8614c8c6d3306bec59dac84bc74455ea1b9c5d35d98c7ce414d8621d91c9dbe868916a8b89be6c60d1013235ef5c21ab aslr-pie.patch
-6c5165692519c630cb96a254088e55d4d7412bd0f45920c0bf514dd9c68d24625da91798158fe502b6c214a7b8d44ae6b2e49b39aed6da3c1344f816f90405a3 CVE-2013-4348.patch
4612728f2f6b3d9ac043606511c2f6147f98aa716d16c8633776b83d1b98d997277e650cab537e2f87c1225541294f51302598cd5e543a353d768bbc68e91ab4 kernelconfig.x86
a3d9e72659f6a53b4bc47350fbf427263c2cc8320ef61e64f22a7402c4ba16d8ae2a3df5057ab09431d4b8a4e2c2a41b86d188b89d830c7301c6943360e83954 kernelconfig.x86_64"
diff --git a/main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff b/main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff
index 97983a951..0431b8adc 100644
--- a/main/linux-vserver/patch-3.10.19-vs2.3.6.8.diff
+++ b/main/linux-vserver/patch-3.10.23-vs2.3.6.8.diff
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.10.19/Documentation/vserver/debug.txt linux-3.10.19-vs2.3.6.8/Documentation/vserver/debug.txt
---- linux-3.10.19/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/Documentation/vserver/debug.txt linux-3.10.21-vs2.3.6.8/Documentation/vserver/debug.txt
+--- linux-3.10.21/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/Documentation/vserver/debug.txt 2013-08-22 20:29:59.000000000 +0000
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -156,21 +156,21 @@ diff -NurpP --minimal linux-3.10.19/Documentation/vserver/debug.txt linux-3.10.1
+ m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s"
+ "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
+ "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.10.19/Makefile linux-3.10.19-vs2.3.6.8/Makefile
---- linux-3.10.19/Makefile 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/Makefile 2013-11-14 04:32:32.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/Makefile linux-3.10.21-vs2.3.6.8/Makefile
+--- linux-3.10.21/Makefile 2013-11-30 07:50:36.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/Makefile 2013-11-30 08:28:38.000000000 +0000
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 10
- SUBLEVEL = 19
+ SUBLEVEL = 23
-EXTRAVERSION =
+EXTRAVERSION = -vs2.3.6.8
NAME = TOSSUG Baby Fish
# *DOCUMENTATION*
-diff -NurpP --minimal linux-3.10.19/arch/alpha/Kconfig linux-3.10.19-vs2.3.6.8/arch/alpha/Kconfig
---- linux-3.10.19/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/alpha/Kconfig linux-3.10.21-vs2.3.6.8/arch/alpha/Kconfig
+--- linux-3.10.21/arch/alpha/Kconfig 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/alpha/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -180,9 +180,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/Kconfig linux-3.10.19-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/systbls.S linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/systbls.S
---- linux-3.10.19/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/alpha/kernel/systbls.S linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/systbls.S
+--- linux-3.10.21/arch/alpha/kernel/systbls.S 2013-02-19 13:56:11.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/systbls.S 2013-08-22 20:29:59.000000000 +0000
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -192,9 +192,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/systbls.S linux-3.10.19-vs
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/traps.c
---- linux-3.10.19/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/alpha/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/traps.c
+--- linux-3.10.21/arch/alpha/kernel/traps.c 2013-07-14 17:00:13.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/alpha/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -177,7 +177,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.10.19/arch/alpha/kernel/traps.c linux-3.10.19-vs2.
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.10.19/arch/arm/Kconfig linux-3.10.19-vs2.3.6.8/arch/arm/Kconfig
---- linux-3.10.19/arch/arm/Kconfig 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/arm/Kconfig linux-3.10.21-vs2.3.6.8/arch/arm/Kconfig
+--- linux-3.10.21/arch/arm/Kconfig 2013-11-30 07:50:36.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/arm/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -2238,6 +2238,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -217,9 +217,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/Kconfig linux-3.10.19-vs2.3.6.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/calls.S linux-3.10.19-vs2.3.6.8/arch/arm/kernel/calls.S
---- linux-3.10.19/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/arm/kernel/calls.S linux-3.10.21-vs2.3.6.8/arch/arm/kernel/calls.S
+--- linux-3.10.21/arch/arm/kernel/calls.S 2013-05-31 13:44:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/arm/kernel/calls.S 2013-08-22 20:29:59.000000000 +0000
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -229,9 +229,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/calls.S linux-3.10.19-vs2.3.
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/arm/kernel/traps.c
---- linux-3.10.19/arch/arm/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/arm/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/arm/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/arm/kernel/traps.c
+--- linux-3.10.21/arch/arm/kernel/traps.c 2013-11-30 07:50:36.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/arm/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
@@ -240,8 +240,8 @@ static int __die(const char *str, int er
print_modules();
@@ -243,9 +243,9 @@ diff -NurpP --minimal linux-3.10.19/arch/arm/kernel/traps.c linux-3.10.19-vs2.3.
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.10.19/arch/cris/Kconfig linux-3.10.19-vs2.3.6.8/arch/cris/Kconfig
---- linux-3.10.19/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/cris/Kconfig linux-3.10.21-vs2.3.6.8/arch/cris/Kconfig
+--- linux-3.10.21/arch/cris/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/cris/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -673,6 +673,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-3.10.19/arch/cris/Kconfig linux-3.10.19-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/h8300/Kconfig linux-3.10.19-vs2.3.6.8/arch/h8300/Kconfig
---- linux-3.10.19/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/h8300/Kconfig linux-3.10.21-vs2.3.6.8/arch/h8300/Kconfig
+--- linux-3.10.21/arch/h8300/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/h8300/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -218,6 +218,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-3.10.19/arch/h8300/Kconfig linux-3.10.19-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/ia64/Kconfig linux-3.10.19-vs2.3.6.8/arch/ia64/Kconfig
---- linux-3.10.19/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/ia64/Kconfig linux-3.10.21-vs2.3.6.8/arch/ia64/Kconfig
+--- linux-3.10.21/arch/ia64/Kconfig 2013-07-14 17:00:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/ia64/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -643,6 +643,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -279,9 +279,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/Kconfig linux-3.10.19-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/entry.S linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/entry.S
---- linux-3.10.19/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/entry.S linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/entry.S
+--- linux-3.10.21/arch/ia64/kernel/entry.S 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/entry.S 2013-08-22 20:29:59.000000000 +0000
@@ -1719,7 +1719,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -291,9 +291,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/entry.S linux-3.10.19-vs2.3
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/ptrace.c
---- linux-3.10.19/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/ptrace.c
+--- linux-3.10.21/arch/ia64/kernel/ptrace.c 2013-02-19 13:56:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/ptrace.c linux-3.10.19-vs2.
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/traps.c
---- linux-3.10.19/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/ia64/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/traps.c
+--- linux-3.10.21/arch/ia64/kernel/traps.c 2013-05-31 13:44:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/ia64/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -329,9 +329,9 @@ diff -NurpP --minimal linux-3.10.19/arch/ia64/kernel/traps.c linux-3.10.19-vs2.3
}
}
}
-diff -NurpP --minimal linux-3.10.19/arch/m32r/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/m32r/kernel/traps.c
---- linux-3.10.19/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/m32r/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/m32r/kernel/traps.c
+--- linux-3.10.21/arch/m32r/kernel/traps.c 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/m32r/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -344,9 +344,9 @@ diff -NurpP --minimal linux-3.10.19/arch/m32r/kernel/traps.c linux-3.10.19-vs2.3
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.10.19/arch/m68k/Kconfig linux-3.10.19-vs2.3.6.8/arch/m68k/Kconfig
---- linux-3.10.19/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/m68k/Kconfig linux-3.10.21-vs2.3.6.8/arch/m68k/Kconfig
+--- linux-3.10.21/arch/m68k/Kconfig 2013-07-14 17:00:26.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/m68k/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -134,6 +134,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -356,9 +356,9 @@ diff -NurpP --minimal linux-3.10.19/arch/m68k/Kconfig linux-3.10.19-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/mips/Kconfig linux-3.10.19-vs2.3.6.8/arch/mips/Kconfig
---- linux-3.10.19/arch/mips/Kconfig 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/Kconfig linux-3.10.21-vs2.3.6.8/arch/mips/Kconfig
+--- linux-3.10.21/arch/mips/Kconfig 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -2583,6 +2583,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -368,9 +368,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/Kconfig linux-3.10.19-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/mips/kernel/ptrace.c
---- linux-3.10.19/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/mips/kernel/ptrace.c
+--- linux-3.10.21/arch/mips/kernel/ptrace.c 2013-05-31 13:44:42.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -389,9 +389,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/ptrace.c linux-3.10.19-vs2.
switch (request) {
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall32-o32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
---- linux-3.10.19/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall32-o32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall32-o32.S
+--- linux-3.10.21/arch/mips/kernel/scall32-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall32-o32.S 2013-08-22 20:29:59.000000000 +0000
@@ -521,7 +521,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -401,9 +401,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall32-o32.S linux-3.10.19
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-64.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-64.S
---- linux-3.10.19/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-64.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-64.S
+--- linux-3.10.21/arch/mips/kernel/scall64-64.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-64.S 2013-08-22 20:29:59.000000000 +0000
@@ -351,7 +351,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -413,9 +413,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-64.S linux-3.10.19-
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-n32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
---- linux-3.10.19/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-n32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-n32.S
+--- linux-3.10.21/arch/mips/kernel/scall64-n32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-n32.S 2013-08-22 20:29:59.000000000 +0000
@@ -344,7 +344,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -425,9 +425,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-n32.S linux-3.10.19
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-o32.S linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
---- linux-3.10.19/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/scall64-o32.S linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-o32.S
+--- linux-3.10.21/arch/mips/kernel/scall64-o32.S 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/scall64-o32.S 2013-08-22 20:29:59.000000000 +0000
@@ -469,7 +469,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -437,9 +437,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/scall64-o32.S linux-3.10.19
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/mips/kernel/traps.c
---- linux-3.10.19/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/mips/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/mips/kernel/traps.c
+--- linux-3.10.21/arch/mips/kernel/traps.c 2013-07-14 17:00:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/mips/kernel/traps.c 2013-08-22 20:29:59.000000000 +0000
@@ -331,9 +331,10 @@ void show_registers(struct pt_regs *regs
__show_regs(regs);
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-3.10.19/arch/mips/kernel/traps.c linux-3.10.19-vs2.3
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-3.10.19/arch/parisc/Kconfig linux-3.10.19-vs2.3.6.8/arch/parisc/Kconfig
---- linux-3.10.19/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/parisc/Kconfig linux-3.10.21-vs2.3.6.8/arch/parisc/Kconfig
+--- linux-3.10.21/arch/parisc/Kconfig 2013-07-14 17:00:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/parisc/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -318,6 +318,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -466,9 +466,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/Kconfig linux-3.10.19-vs2.3.6.8/
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/syscall_table.S linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
---- linux-3.10.19/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/parisc/kernel/syscall_table.S linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/syscall_table.S
+--- linux-3.10.21/arch/parisc/kernel/syscall_table.S 2013-07-14 17:00:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/syscall_table.S 2013-08-22 20:29:59.000000000 +0000
@@ -358,7 +358,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -478,9 +478,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/syscall_table.S linux-3.1
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/traps.c
---- linux-3.10.19/arch/parisc/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/parisc/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/traps.c
+--- linux-3.10.21/arch/parisc/kernel/traps.c 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/parisc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
@@ -229,8 +229,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -504,9 +504,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/kernel/traps.c linux-3.10.19-vs2
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.10.19/arch/parisc/mm/fault.c linux-3.10.19-vs2.3.6.8/arch/parisc/mm/fault.c
---- linux-3.10.19/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/parisc/mm/fault.c linux-3.10.21-vs2.3.6.8/arch/parisc/mm/fault.c
+--- linux-3.10.21/arch/parisc/mm/fault.c 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/parisc/mm/fault.c 2013-08-22 20:29:59.000000000 +0000
@@ -257,8 +257,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -519,9 +519,9 @@ diff -NurpP --minimal linux-3.10.19/arch/parisc/mm/fault.c linux-3.10.19-vs2.3.6
if (vma) {
printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.10.19/arch/powerpc/Kconfig linux-3.10.19-vs2.3.6.8/arch/powerpc/Kconfig
---- linux-3.10.19/arch/powerpc/Kconfig 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/powerpc/Kconfig linux-3.10.21-vs2.3.6.8/arch/powerpc/Kconfig
+--- linux-3.10.21/arch/powerpc/Kconfig 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/powerpc/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -1010,6 +1010,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -531,9 +531,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/Kconfig linux-3.10.19-vs2.3.6.8
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
---- linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/powerpc/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h
+--- linux-3.10.21/arch/powerpc/include/uapi/asm/unistd.h 2013-05-31 13:44:44.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/powerpc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -543,9 +543,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/include/uapi/asm/unistd.h linux
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-3.10.19/arch/powerpc/kernel/traps.c linux-3.10.19-vs2.3.6.8/arch/powerpc/kernel/traps.c
---- linux-3.10.19/arch/powerpc/kernel/traps.c 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/powerpc/kernel/traps.c linux-3.10.21-vs2.3.6.8/arch/powerpc/kernel/traps.c
+--- linux-3.10.21/arch/powerpc/kernel/traps.c 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/powerpc/kernel/traps.c 2013-11-13 17:17:15.000000000 +0000
@@ -1231,8 +1231,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -558,9 +558,9 @@ diff -NurpP --minimal linux-3.10.19/arch/powerpc/kernel/traps.c linux-3.10.19-vs
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-3.10.19/arch/s390/Kconfig linux-3.10.19-vs2.3.6.8/arch/s390/Kconfig
---- linux-3.10.19/arch/s390/Kconfig 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/s390/Kconfig linux-3.10.21-vs2.3.6.8/arch/s390/Kconfig
+--- linux-3.10.21/arch/s390/Kconfig 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/s390/Kconfig 2013-11-13 17:17:15.000000000 +0000
@@ -579,6 +579,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -570,9 +570,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/Kconfig linux-3.10.19-vs2.3.6.8/ar
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/s390/include/asm/tlb.h linux-3.10.19-vs2.3.6.8/arch/s390/include/asm/tlb.h
---- linux-3.10.19/arch/s390/include/asm/tlb.h 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/s390/include/asm/tlb.h linux-3.10.21-vs2.3.6.8/arch/s390/include/asm/tlb.h
+--- linux-3.10.21/arch/s390/include/asm/tlb.h 2013-11-30 07:50:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/s390/include/asm/tlb.h 2013-11-13 17:17:15.000000000 +0000
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -581,9 +581,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/include/asm/tlb.h linux-3.10.19-vs
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.10.19/arch/s390/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
---- linux-3.10.19/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/s390/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h
+--- linux-3.10.21/arch/s390/include/uapi/asm/unistd.h 2013-02-19 13:57:16.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/s390/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -200,7 +200,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -593,9 +593,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/include/uapi/asm/unistd.h linux-3.
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/arch/s390/kernel/ptrace.c
---- linux-3.10.19/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/s390/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/arch/s390/kernel/ptrace.c
+--- linux-3.10.21/arch/s390/kernel/ptrace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/s390/kernel/ptrace.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/ptrace.c linux-3.10.19-vs2.
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/syscalls.S linux-3.10.19-vs2.3.6.8/arch/s390/kernel/syscalls.S
---- linux-3.10.19/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/s390/kernel/syscalls.S linux-3.10.21-vs2.3.6.8/arch/s390/kernel/syscalls.S
+--- linux-3.10.21/arch/s390/kernel/syscalls.S 2013-07-14 17:00:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/s390/kernel/syscalls.S 2013-08-22 20:29:59.000000000 +0000
@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */
SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.10.19/arch/s390/kernel/syscalls.S linux-3.10.19-vs
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.10.19/arch/sh/Kconfig linux-3.10.19-vs2.3.6.8/arch/sh/Kconfig
---- linux-3.10.19/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sh/Kconfig linux-3.10.21-vs2.3.6.8/arch/sh/Kconfig
+--- linux-3.10.21/arch/sh/Kconfig 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sh/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -928,6 +928,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -628,9 +628,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sh/Kconfig linux-3.10.19-vs2.3.6.8/arch
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/sh/kernel/irq.c linux-3.10.19-vs2.3.6.8/arch/sh/kernel/irq.c
---- linux-3.10.19/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sh/kernel/irq.c linux-3.10.21-vs2.3.6.8/arch/sh/kernel/irq.c
+--- linux-3.10.21/arch/sh/kernel/irq.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sh/kernel/irq.c 2013-08-22 20:29:59.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/ftrace.h>
#include <linux/delay.h>
@@ -639,9 +639,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sh/kernel/irq.c linux-3.10.19-vs2.3.6.8
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.10.19/arch/sparc/Kconfig linux-3.10.19-vs2.3.6.8/arch/sparc/Kconfig
---- linux-3.10.19/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sparc/Kconfig linux-3.10.21-vs2.3.6.8/arch/sparc/Kconfig
+--- linux-3.10.21/arch/sparc/Kconfig 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sparc/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -550,6 +550,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -651,9 +651,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/Kconfig linux-3.10.19-vs2.3.6.8/a
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h linux-3.10.19-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
---- linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sparc/include/uapi/asm/unistd.h linux-3.10.21-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h
+--- linux-3.10.21/arch/sparc/include/uapi/asm/unistd.h 2013-02-19 13:57:17.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sparc/include/uapi/asm/unistd.h 2013-08-22 20:29:59.000000000 +0000
@@ -332,7 +332,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -663,9 +663,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/include/uapi/asm/unistd.h linux-3
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_32.S linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
---- linux-3.10.19/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sparc/kernel/systbls_32.S linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_32.S
+--- linux-3.10.21/arch/sparc/kernel/systbls_32.S 2013-05-31 13:44:48.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_32.S 2013-08-22 20:29:59.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
@@ -675,9 +675,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_32.S linux-3.10.19
/*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
/*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_64.S linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
---- linux-3.10.19/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/sparc/kernel/systbls_64.S linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_64.S
+--- linux-3.10.21/arch/sparc/kernel/systbls_64.S 2013-07-14 17:00:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/sparc/kernel/systbls_64.S 2013-08-22 20:29:59.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
@@ -696,9 +696,9 @@ diff -NurpP --minimal linux-3.10.19/arch/sparc/kernel/systbls_64.S linux-3.10.19
/*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.10.19/arch/um/Kconfig.rest linux-3.10.19-vs2.3.6.8/arch/um/Kconfig.rest
---- linux-3.10.19/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/um/Kconfig.rest linux-3.10.21-vs2.3.6.8/arch/um/Kconfig.rest
+--- linux-3.10.21/arch/um/Kconfig.rest 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/um/Kconfig.rest 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
source "fs/Kconfig"
@@ -708,9 +708,9 @@ diff -NurpP --minimal linux-3.10.19/arch/um/Kconfig.rest linux-3.10.19-vs2.3.6.8
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/x86/Kconfig linux-3.10.19-vs2.3.6.8/arch/x86/Kconfig
---- linux-3.10.19/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/x86/Kconfig linux-3.10.21-vs2.3.6.8/arch/x86/Kconfig
+--- linux-3.10.21/arch/x86/Kconfig 2013-07-14 17:00:36.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/x86/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -2339,6 +2339,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -720,9 +720,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/Kconfig linux-3.10.19-vs2.3.6.8/arc
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_32.tbl linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
---- linux-3.10.19/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/x86/syscalls/syscall_32.tbl linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.10.21/arch/x86/syscalls/syscall_32.tbl 2013-07-14 17:00:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_32.tbl 2013-08-22 20:29:59.000000000 +0000
@@ -279,7 +279,7 @@
270 i386 tgkill sys_tgkill
271 i386 utimes sys_utimes compat_sys_utimes
@@ -732,9 +732,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_32.tbl linux-3.10.
274 i386 mbind sys_mbind
275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
276 i386 set_mempolicy sys_set_mempolicy
-diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_64.tbl linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
---- linux-3.10.19/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/arch/x86/syscalls/syscall_64.tbl linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.10.21/arch/x86/syscalls/syscall_64.tbl 2013-05-31 13:44:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/arch/x86/syscalls/syscall_64.tbl 2013-08-22 20:29:59.000000000 +0000
@@ -242,7 +242,7 @@
233 common epoll_ctl sys_epoll_ctl
234 common tgkill sys_tgkill
@@ -744,9 +744,9 @@ diff -NurpP --minimal linux-3.10.19/arch/x86/syscalls/syscall_64.tbl linux-3.10.
237 common mbind sys_mbind
238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy sys_get_mempolicy
-diff -NurpP --minimal linux-3.10.19/drivers/block/Kconfig linux-3.10.19-vs2.3.6.8/drivers/block/Kconfig
---- linux-3.10.19/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/block/Kconfig linux-3.10.21-vs2.3.6.8/drivers/block/Kconfig
+--- linux-3.10.21/drivers/block/Kconfig 2013-05-31 13:44:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/block/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -278,6 +278,13 @@ config BLK_DEV_CRYPTOLOOP
source "drivers/block/drbd/Kconfig"
@@ -761,9 +761,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/Kconfig linux-3.10.19-vs2.3.6.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-3.10.19/drivers/block/Makefile linux-3.10.19-vs2.3.6.8/drivers/block/Makefile
---- linux-3.10.19/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/block/Makefile linux-3.10.21-vs2.3.6.8/drivers/block/Makefile
+--- linux-3.10.21/drivers/block/Makefile 2013-07-14 17:00:41.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/block/Makefile 2013-08-22 20:29:59.000000000 +0000
@@ -33,6 +33,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
@@ -772,9 +772,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/Makefile linux-3.10.19-vs2.3.6
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/
-diff -NurpP --minimal linux-3.10.19/drivers/block/loop.c linux-3.10.19-vs2.3.6.8/drivers/block/loop.c
---- linux-3.10.19/drivers/block/loop.c 2013-07-14 17:00:41.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/block/loop.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/block/loop.c linux-3.10.21-vs2.3.6.8/drivers/block/loop.c
+--- linux-3.10.21/drivers/block/loop.c 2013-11-30 07:50:39.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/block/loop.c 2013-11-30 07:53:00.000000000 +0000
@@ -76,6 +76,7 @@
#include <linux/sysfs.h>
#include <linux/miscdevice.h>
@@ -830,9 +830,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/loop.c linux-3.10.19-vs2.3.6.8
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.10.19/drivers/block/vroot.c linux-3.10.19-vs2.3.6.8/drivers/block/vroot.c
---- linux-3.10.19/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/block/vroot.c linux-3.10.21-vs2.3.6.8/drivers/block/vroot.c
+--- linux-3.10.21/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/block/vroot.c 2013-08-23 00:23:45.000000000 +0000
@@ -0,0 +1,290 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1124,9 +1124,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/block/vroot.c linux-3.10.19-vs2.3.6.
+
+#endif
+
-diff -NurpP --minimal linux-3.10.19/drivers/infiniband/Kconfig linux-3.10.19-vs2.3.6.8/drivers/infiniband/Kconfig
---- linux-3.10.19/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/infiniband/Kconfig linux-3.10.21-vs2.3.6.8/drivers/infiniband/Kconfig
+--- linux-3.10.21/drivers/infiniband/Kconfig 2013-07-14 17:00:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/infiniband/Kconfig 2013-08-22 20:29:59.000000000 +0000
@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
@@ -1136,9 +1136,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/infiniband/Kconfig linux-3.10.19-vs2
default y
source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.10.19/drivers/infiniband/core/addr.c linux-3.10.19-vs2.3.6.8/drivers/infiniband/core/addr.c
---- linux-3.10.19/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/infiniband/core/addr.c linux-3.10.21-vs2.3.6.8/drivers/infiniband/core/addr.c
+--- linux-3.10.21/drivers/infiniband/core/addr.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/infiniband/core/addr.c 2013-08-22 20:29:59.000000000 +0000
@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr
if (ipv6_addr_any(&fl6.saddr)) {
@@ -1148,9 +1148,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/infiniband/core/addr.c linux-3.10.19
if (ret)
goto put;
-diff -NurpP --minimal linux-3.10.19/drivers/md/dm-ioctl.c linux-3.10.19-vs2.3.6.8/drivers/md/dm-ioctl.c
---- linux-3.10.19/drivers/md/dm-ioctl.c 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/md/dm-ioctl.c linux-3.10.21-vs2.3.6.8/drivers/md/dm-ioctl.c
+--- linux-3.10.21/drivers/md/dm-ioctl.c 2013-11-30 07:50:42.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/md/dm-ioctl.c 2013-11-13 17:17:15.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1236,9 +1236,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm-ioctl.c linux-3.10.19-vs2.3.6.
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.10.19/drivers/md/dm.c linux-3.10.19-vs2.3.6.8/drivers/md/dm.c
---- linux-3.10.19/drivers/md/dm.c 2013-11-13 17:21:12.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/md/dm.c linux-3.10.21-vs2.3.6.8/drivers/md/dm.c
+--- linux-3.10.21/drivers/md/dm.c 2013-11-30 07:50:42.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/md/dm.c 2013-11-13 17:17:15.000000000 +0000
@@ -19,6 +19,7 @@
#include <linux/idr.h>
#include <linux/hdreg.h>
@@ -1312,9 +1312,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm.c linux-3.10.19-vs2.3.6.8/driv
md->queue = blk_alloc_queue(GFP_KERNEL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-3.10.19/drivers/md/dm.h linux-3.10.19-vs2.3.6.8/drivers/md/dm.h
---- linux-3.10.19/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/md/dm.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/md/dm.h linux-3.10.21-vs2.3.6.8/drivers/md/dm.h
+--- linux-3.10.21/drivers/md/dm.h 2013-02-19 13:57:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/md/dm.h 2013-08-22 20:29:59.000000000 +0000
@@ -46,6 +46,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1324,9 +1324,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/md/dm.h linux-3.10.19-vs2.3.6.8/driv
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.10.19/drivers/net/tun.c linux-3.10.19-vs2.3.6.8/drivers/net/tun.c
---- linux-3.10.19/drivers/net/tun.c 2013-11-13 17:21:13.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/net/tun.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/net/tun.c linux-3.10.21-vs2.3.6.8/drivers/net/tun.c
+--- linux-3.10.21/drivers/net/tun.c 2013-11-30 07:50:43.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/net/tun.c 2013-11-13 17:17:15.000000000 +0000
@@ -64,6 +64,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
@@ -1395,9 +1395,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/net/tun.c linux-3.10.19-vs2.3.6.8/dr
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.10.19/drivers/tty/sysrq.c linux-3.10.19-vs2.3.6.8/drivers/tty/sysrq.c
---- linux-3.10.19/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/tty/sysrq.c linux-3.10.21-vs2.3.6.8/drivers/tty/sysrq.c
+--- linux-3.10.21/drivers/tty/sysrq.c 2013-07-14 17:01:22.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/tty/sysrq.c 2013-08-22 20:58:35.000000000 +0000
@@ -44,6 +44,7 @@
#include <linux/uaccess.h>
#include <linux/moduleparam.h>
@@ -1449,9 +1449,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/tty/sysrq.c linux-3.10.19-vs2.3.6.8/
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-3.10.19/drivers/tty/tty_io.c linux-3.10.19-vs2.3.6.8/drivers/tty/tty_io.c
---- linux-3.10.19/drivers/tty/tty_io.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/drivers/tty/tty_io.c linux-3.10.21-vs2.3.6.8/drivers/tty/tty_io.c
+--- linux-3.10.21/drivers/tty/tty_io.c 2013-11-30 07:50:45.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/drivers/tty/tty_io.c 2013-11-13 17:17:15.000000000 +0000
@@ -104,6 +104,7 @@
#include <linux/kmod.h>
@@ -1478,9 +1478,9 @@ diff -NurpP --minimal linux-3.10.19/drivers/tty/tty_io.c linux-3.10.19-vs2.3.6.8
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-3.10.19/fs/attr.c linux-3.10.19-vs2.3.6.8/fs/attr.c
---- linux-3.10.19/fs/attr.c 2013-02-19 13:58:46.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/attr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/attr.c linux-3.10.21-vs2.3.6.8/fs/attr.c
+--- linux-3.10.21/fs/attr.c 2013-02-19 13:58:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/attr.c 2013-08-22 20:29:59.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/security.h>
#include <linux/evm.h>
@@ -1521,9 +1521,9 @@ diff -NurpP --minimal linux-3.10.19/fs/attr.c linux-3.10.19-vs2.3.6.8/fs/attr.c
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
return -EPERM;
}
-diff -NurpP --minimal linux-3.10.19/fs/block_dev.c linux-3.10.19-vs2.3.6.8/fs/block_dev.c
---- linux-3.10.19/fs/block_dev.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/block_dev.c linux-3.10.21-vs2.3.6.8/fs/block_dev.c
+--- linux-3.10.21/fs/block_dev.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/block_dev.c 2013-11-13 17:17:15.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/log2.h>
#include <linux/cleancache.h>
@@ -1561,9 +1561,9 @@ diff -NurpP --minimal linux-3.10.19/fs/block_dev.c linux-3.10.19-vs2.3.6.8/fs/bl
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.10.19/fs/btrfs/ctree.h linux-3.10.19-vs2.3.6.8/fs/btrfs/ctree.h
---- linux-3.10.19/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/btrfs/ctree.h linux-3.10.21-vs2.3.6.8/fs/btrfs/ctree.h
+--- linux-3.10.21/fs/btrfs/ctree.h 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/btrfs/ctree.h 2013-08-22 20:29:59.000000000 +0000
@@ -707,11 +707,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -1616,9 +1616,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/ctree.h linux-3.10.19-vs2.3.6.8/fs/
int btrfs_defrag_file(struct inode *inode, struct file *file,
struct btrfs_ioctl_defrag_range_args *range,
u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.10.19/fs/btrfs/disk-io.c linux-3.10.19-vs2.3.6.8/fs/btrfs/disk-io.c
---- linux-3.10.19/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/btrfs/disk-io.c linux-3.10.21-vs2.3.6.8/fs/btrfs/disk-io.c
+--- linux-3.10.21/fs/btrfs/disk-io.c 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/btrfs/disk-io.c 2013-08-22 20:29:59.000000000 +0000
@@ -2360,6 +2360,9 @@ int open_ctree(struct super_block *sb,
goto fail_alloc;
}
@@ -1629,9 +1629,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/disk-io.c linux-3.10.19-vs2.3.6.8/f
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-3.10.19/fs/btrfs/inode.c linux-3.10.19-vs2.3.6.8/fs/btrfs/inode.c
---- linux-3.10.19/fs/btrfs/inode.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/inode.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/btrfs/inode.c linux-3.10.21-vs2.3.6.8/fs/btrfs/inode.c
+--- linux-3.10.21/fs/btrfs/inode.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/btrfs/inode.c 2013-11-13 17:17:16.000000000 +0000
@@ -42,6 +42,7 @@
#include <linux/mount.h>
#include <linux/btrfs.h>
@@ -1702,9 +1702,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/inode.c linux-3.10.19-vs2.3.6.8/fs/
.get_acl = btrfs_get_acl,
};
-diff -NurpP --minimal linux-3.10.19/fs/btrfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/btrfs/ioctl.c
---- linux-3.10.19/fs/btrfs/ioctl.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/ioctl.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/btrfs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/btrfs/ioctl.c
+--- linux-3.10.21/fs/btrfs/ioctl.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/btrfs/ioctl.c 2013-11-13 17:17:16.000000000 +0000
@@ -75,10 +75,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -1876,9 +1876,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-3.10.19/fs/btrfs/super.c linux-3.10.19-vs2.3.6.8/fs/btrfs/super.c
---- linux-3.10.19/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/btrfs/super.c linux-3.10.21-vs2.3.6.8/fs/btrfs/super.c
+--- linux-3.10.21/fs/btrfs/super.c 2013-07-14 17:01:26.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/btrfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -319,7 +319,7 @@ enum {
Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -1934,9 +1934,9 @@ diff -NurpP --minimal linux-3.10.19/fs/btrfs/super.c linux-3.10.19-vs2.3.6.8/fs/
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
goto out;
-diff -NurpP --minimal linux-3.10.19/fs/char_dev.c linux-3.10.19-vs2.3.6.8/fs/char_dev.c
---- linux-3.10.19/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/char_dev.c linux-3.10.21-vs2.3.6.8/fs/char_dev.c
+--- linux-3.10.21/fs/char_dev.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/char_dev.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,8 @@
#include <linux/mutex.h>
#include <linux/backing-dev.h>
@@ -1969,9 +1969,9 @@ diff -NurpP --minimal linux-3.10.19/fs/char_dev.c linux-3.10.19-vs2.3.6.8/fs/cha
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.10.19/fs/dcache.c linux-3.10.19-vs2.3.6.8/fs/dcache.c
---- linux-3.10.19/fs/dcache.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/dcache.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/dcache.c linux-3.10.21-vs2.3.6.8/fs/dcache.c
+--- linux-3.10.21/fs/dcache.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/dcache.c 2013-11-13 17:17:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rculist_bl.h>
#include <linux/prefetch.h>
@@ -2023,9 +2023,9 @@ diff -NurpP --minimal linux-3.10.19/fs/dcache.c linux-3.10.19-vs2.3.6.8/fs/dcach
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-3.10.19/fs/devpts/inode.c linux-3.10.19-vs2.3.6.8/fs/devpts/inode.c
---- linux-3.10.19/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/devpts/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/devpts/inode.c linux-3.10.21-vs2.3.6.8/fs/devpts/inode.c
+--- linux-3.10.21/fs/devpts/inode.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/devpts/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2113,9 +2113,9 @@ diff -NurpP --minimal linux-3.10.19/fs/devpts/inode.c linux-3.10.19-vs2.3.6.8/fs
inode->i_private = priv;
sprintf(s, "%d", index);
-diff -NurpP --minimal linux-3.10.19/fs/ext2/balloc.c linux-3.10.19-vs2.3.6.8/fs/ext2/balloc.c
---- linux-3.10.19/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/balloc.c linux-3.10.21-vs2.3.6.8/fs/ext2/balloc.c
+--- linux-3.10.21/fs/ext2/balloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/balloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2124,9 +2124,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/balloc.c linux-3.10.19-vs2.3.6.8/fs/
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-3.10.19/fs/ext2/ext2.h linux-3.10.19-vs2.3.6.8/fs/ext2/ext2.h
---- linux-3.10.19/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/ext2.h linux-3.10.21-vs2.3.6.8/fs/ext2/ext2.h
+--- linux-3.10.21/fs/ext2/ext2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/ext2.h 2013-08-22 20:29:59.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) */
@@ -2174,18 +2174,18 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ext2.h linux-3.10.19-vs2.3.6.8/fs/ex
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.10.19/fs/ext2/file.c linux-3.10.19-vs2.3.6.8/fs/ext2/file.c
---- linux-3.10.19/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/file.c linux-3.10.21-vs2.3.6.8/fs/ext2/file.c
+--- linux-3.10.21/fs/ext2/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.get_acl = ext2_get_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-3.10.19/fs/ext2/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext2/ialloc.c
---- linux-3.10.19/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext2/ialloc.c
+--- linux-3.10.21/fs/ext2/ialloc.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/ialloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2202,9 +2202,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.10.19/fs/ext2/inode.c linux-3.10.19-vs2.3.6.8/fs/ext2/inode.c
---- linux-3.10.19/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/inode.c linux-3.10.21-vs2.3.6.8/fs/ext2/inode.c
+--- linux-3.10.21/fs/ext2/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/inode.c 2013-08-22 21:46:54.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/fiemap.h>
#include <linux/namei.h>
@@ -2337,9 +2337,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/inode.c linux-3.10.19-vs2.3.6.8/fs/e
error = dquot_transfer(inode, iattr);
if (error)
return error;
-diff -NurpP --minimal linux-3.10.19/fs/ext2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext2/ioctl.c
---- linux-3.10.19/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext2/ioctl.c
+--- linux-3.10.21/fs/ext2/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2389,9 +2389,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.10.19/fs/ext2/namei.c linux-3.10.19-vs2.3.6.8/fs/ext2/namei.c
---- linux-3.10.19/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/namei.c linux-3.10.21-vs2.3.6.8/fs/ext2/namei.c
+--- linux-3.10.21/fs/ext2/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -32,6 +32,7 @@
#include <linux/pagemap.h>
@@ -2416,9 +2416,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/namei.c linux-3.10.19-vs2.3.6.8/fs/e
.get_acl = ext2_get_acl,
};
-diff -NurpP --minimal linux-3.10.19/fs/ext2/super.c linux-3.10.19-vs2.3.6.8/fs/ext2/super.c
---- linux-3.10.19/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext2/super.c linux-3.10.21-vs2.3.6.8/fs/ext2/super.c
+--- linux-3.10.21/fs/ext2/super.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext2/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -395,7 +395,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2484,9 +2484,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext2/super.c linux-3.10.19-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.19/fs/ext3/ext3.h linux-3.10.19-vs2.3.6.8/fs/ext3/ext3.h
---- linux-3.10.19/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/ext3.h linux-3.10.21-vs2.3.6.8/fs/ext3/ext3.h
+--- linux-3.10.21/fs/ext3/ext3.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/ext3.h 2013-08-22 20:29:59.000000000 +0000
@@ -151,10 +151,14 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -2538,9 +2538,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ext3.h linux-3.10.19-vs2.3.6.8/fs/ex
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.10.19/fs/ext3/file.c linux-3.10.19-vs2.3.6.8/fs/ext3/file.c
---- linux-3.10.19/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/file.c linux-3.10.21-vs2.3.6.8/fs/ext3/file.c
+--- linux-3.10.21/fs/ext3/file.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
#endif
.get_acl = ext3_get_acl,
@@ -2548,9 +2548,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/file.c linux-3.10.19-vs2.3.6.8/fs/ex
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-3.10.19/fs/ext3/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext3/ialloc.c
---- linux-3.10.19/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext3/ialloc.c
+--- linux-3.10.21/fs/ext3/ialloc.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/ialloc.c 2013-08-22 20:29:59.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/quotaops.h>
@@ -2567,9 +2567,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
-diff -NurpP --minimal linux-3.10.19/fs/ext3/inode.c linux-3.10.19-vs2.3.6.8/fs/ext3/inode.c
---- linux-3.10.19/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/inode.c linux-3.10.21-vs2.3.6.8/fs/ext3/inode.c
+--- linux-3.10.21/fs/ext3/inode.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/inode.c 2013-08-22 21:21:18.000000000 +0000
@@ -28,6 +28,8 @@
#include <linux/mpage.h>
#include <linux/namei.h>
@@ -2702,9 +2702,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/inode.c linux-3.10.19-vs2.3.6.8/fs/e
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.10.19/fs/ext3/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext3/ioctl.c
---- linux-3.10.19/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext3/ioctl.c
+--- linux-3.10.21/fs/ext3/ioctl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,34 @@
#include <asm/uaccess.h>
#include "ext3.h"
@@ -2772,9 +2772,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-3.10.19/fs/ext3/namei.c linux-3.10.19-vs2.3.6.8/fs/ext3/namei.c
---- linux-3.10.19/fs/ext3/namei.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/namei.c linux-3.10.21-vs2.3.6.8/fs/ext3/namei.c
+--- linux-3.10.21/fs/ext3/namei.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/namei.c 2013-11-13 17:17:16.000000000 +0000
@@ -25,6 +25,8 @@
*/
@@ -2800,9 +2800,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/namei.c linux-3.10.19-vs2.3.6.8/fs/e
.get_acl = ext3_get_acl,
};
-diff -NurpP --minimal linux-3.10.19/fs/ext3/super.c linux-3.10.19-vs2.3.6.8/fs/ext3/super.c
---- linux-3.10.19/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext3/super.c linux-3.10.21-vs2.3.6.8/fs/ext3/super.c
+--- linux-3.10.21/fs/ext3/super.c 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext3/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -813,7 +813,8 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2869,9 +2869,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext3/super.c linux-3.10.19-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.19/fs/ext4/ext4.h linux-3.10.19-vs2.3.6.8/fs/ext4/ext4.h
---- linux-3.10.19/fs/ext4/ext4.h 2013-07-14 17:01:27.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ext4.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/ext4.h linux-3.10.21-vs2.3.6.8/fs/ext4/ext4.h
+--- linux-3.10.21/fs/ext4/ext4.h 2013-07-14 17:01:27.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/ext4.h 2013-08-22 20:29:59.000000000 +0000
@@ -387,7 +387,10 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -2916,9 +2916,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ext4.h linux-3.10.19-vs2.3.6.8/fs/ex
extern int ext4_try_to_evict_inline_data(handle_t *handle,
struct inode *inode,
int needed);
-diff -NurpP --minimal linux-3.10.19/fs/ext4/file.c linux-3.10.19-vs2.3.6.8/fs/ext4/file.c
---- linux-3.10.19/fs/ext4/file.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/file.c linux-3.10.21-vs2.3.6.8/fs/ext4/file.c
+--- linux-3.10.21/fs/ext4/file.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/file.c 2013-11-13 17:17:16.000000000 +0000
@@ -651,5 +651,6 @@ const struct inode_operations ext4_file_
.removexattr = generic_removexattr,
.get_acl = ext4_get_acl,
@@ -2926,9 +2926,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/file.c linux-3.10.19-vs2.3.6.8/fs/ex
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-3.10.19/fs/ext4/ialloc.c linux-3.10.19-vs2.3.6.8/fs/ext4/ialloc.c
---- linux-3.10.19/fs/ext4/ialloc.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/ialloc.c linux-3.10.21-vs2.3.6.8/fs/ext4/ialloc.c
+--- linux-3.10.21/fs/ext4/ialloc.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/ialloc.c 2013-11-13 17:17:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -2945,9 +2945,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ialloc.c linux-3.10.19-vs2.3.6.8/fs/
} else
inode_init_owner(inode, dir, mode);
dquot_initialize(inode);
-diff -NurpP --minimal linux-3.10.19/fs/ext4/inode.c linux-3.10.19-vs2.3.6.8/fs/ext4/inode.c
---- linux-3.10.19/fs/ext4/inode.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/inode.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/inode.c linux-3.10.21-vs2.3.6.8/fs/ext4/inode.c
+--- linux-3.10.21/fs/ext4/inode.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/inode.c 2013-11-13 17:17:16.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/slab.h>
#include <linux/ratelimit.h>
@@ -3083,9 +3083,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/inode.c linux-3.10.19-vs2.3.6.8/fs/e
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-3.10.19/fs/ext4/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ext4/ioctl.c
---- linux-3.10.19/fs/ext4/ioctl.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/ioctl.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ext4/ioctl.c
+--- linux-3.10.21/fs/ext4/ioctl.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/ioctl.c 2013-11-13 17:17:16.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3151,9 +3151,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/ioctl.c linux-3.10.19-vs2.3.6.8/fs/e
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-3.10.19/fs/ext4/namei.c linux-3.10.19-vs2.3.6.8/fs/ext4/namei.c
---- linux-3.10.19/fs/ext4/namei.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/namei.c linux-3.10.21-vs2.3.6.8/fs/ext4/namei.c
+--- linux-3.10.21/fs/ext4/namei.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/namei.c 2013-11-13 17:17:16.000000000 +0000
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3178,9 +3178,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/namei.c linux-3.10.19-vs2.3.6.8/fs/e
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.10.19/fs/ext4/super.c linux-3.10.19-vs2.3.6.8/fs/ext4/super.c
---- linux-3.10.19/fs/ext4/super.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ext4/super.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ext4/super.c linux-3.10.21-vs2.3.6.8/fs/ext4/super.c
+--- linux-3.10.21/fs/ext4/super.c 2013-11-30 07:50:46.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ext4/super.c 2013-11-13 17:17:16.000000000 +0000
@@ -1129,7 +1129,7 @@ enum {
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
@@ -3246,9 +3246,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ext4/super.c linux-3.10.19-vs2.3.6.8/fs/e
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-3.10.19/fs/fcntl.c linux-3.10.19-vs2.3.6.8/fs/fcntl.c
---- linux-3.10.19/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/fcntl.c linux-3.10.21-vs2.3.6.8/fs/fcntl.c
+--- linux-3.10.21/fs/fcntl.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/fcntl.c 2013-08-22 20:29:59.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/rcupdate.h>
#include <linux/pid_namespace.h>
@@ -3266,9 +3266,9 @@ diff -NurpP --minimal linux-3.10.19/fs/fcntl.c linux-3.10.19-vs2.3.6.8/fs/fcntl.
if (unlikely(f.file->f_mode & FMODE_PATH)) {
if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.10.19/fs/file.c linux-3.10.19-vs2.3.6.8/fs/file.c
---- linux-3.10.19/fs/file.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/file.c linux-3.10.21-vs2.3.6.8/fs/file.c
+--- linux-3.10.21/fs/file.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3323,9 +3323,9 @@ diff -NurpP --minimal linux-3.10.19/fs/file.c linux-3.10.19-vs2.3.6.8/fs/file.c
return fd;
-diff -NurpP --minimal linux-3.10.19/fs/file_table.c linux-3.10.19-vs2.3.6.8/fs/file_table.c
---- linux-3.10.19/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/file_table.c linux-3.10.21-vs2.3.6.8/fs/file_table.c
+--- linux-3.10.21/fs/file_table.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/file_table.c 2013-08-22 20:29:59.000000000 +0000
@@ -26,6 +26,8 @@
#include <linux/hardirq.h>
#include <linux/task_work.h>
@@ -3362,9 +3362,9 @@ diff -NurpP --minimal linux-3.10.19/fs/file_table.c linux-3.10.19-vs2.3.6.8/fs/f
file_sb_list_del(file);
file_free(file);
}
-diff -NurpP --minimal linux-3.10.19/fs/fs_struct.c linux-3.10.19-vs2.3.6.8/fs/fs_struct.c
---- linux-3.10.19/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/fs_struct.c linux-3.10.21-vs2.3.6.8/fs/fs_struct.c
+--- linux-3.10.21/fs/fs_struct.c 2013-05-31 13:45:23.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/fs_struct.c 2013-08-22 20:29:59.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -3389,9 +3389,9 @@ diff -NurpP --minimal linux-3.10.19/fs/fs_struct.c linux-3.10.19-vs2.3.6.8/fs/fs
}
return fs;
}
-diff -NurpP --minimal linux-3.10.19/fs/gfs2/file.c linux-3.10.19-vs2.3.6.8/fs/gfs2/file.c
---- linux-3.10.19/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/gfs2/file.c linux-3.10.21-vs2.3.6.8/fs/gfs2/file.c
+--- linux-3.10.21/fs/gfs2/file.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/gfs2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -144,6 +144,9 @@ static const u32 fsflags_to_gfs2[32] = {
[12] = GFS2_DIF_EXHASH,
[14] = GFS2_DIF_INHERIT_JDATA,
@@ -3514,9 +3514,9 @@ diff -NurpP --minimal linux-3.10.19/fs/gfs2/file.c linux-3.10.19-vs2.3.6.8/fs/gf
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-3.10.19/fs/gfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/gfs2/inode.h
---- linux-3.10.19/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/gfs2/inode.h linux-3.10.21-vs2.3.6.8/fs/gfs2/inode.h
+--- linux-3.10.21/fs/gfs2/inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/gfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
@@ -117,6 +117,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -3525,9 +3525,9 @@ diff -NurpP --minimal linux-3.10.19/fs/gfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/g
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.10.19/fs/hostfs/hostfs.h linux-3.10.19-vs2.3.6.8/fs/hostfs/hostfs.h
---- linux-3.10.19/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/hostfs/hostfs.h linux-3.10.21-vs2.3.6.8/fs/hostfs/hostfs.h
+--- linux-3.10.21/fs/hostfs/hostfs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/hostfs/hostfs.h 2013-08-22 20:29:59.000000000 +0000
@@ -42,6 +42,7 @@ struct hostfs_iattr {
unsigned short ia_mode;
uid_t ia_uid;
@@ -3536,9 +3536,9 @@ diff -NurpP --minimal linux-3.10.19/fs/hostfs/hostfs.h linux-3.10.19-vs2.3.6.8/f
loff_t ia_size;
struct timespec ia_atime;
struct timespec ia_mtime;
-diff -NurpP --minimal linux-3.10.19/fs/inode.c linux-3.10.19-vs2.3.6.8/fs/inode.c
---- linux-3.10.19/fs/inode.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/inode.c linux-3.10.21-vs2.3.6.8/fs/inode.c
+--- linux-3.10.21/fs/inode.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -17,6 +17,7 @@
#include <linux/prefetch.h>
#include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3601,9 +3601,9 @@ diff -NurpP --minimal linux-3.10.19/fs/inode.c linux-3.10.19-vs2.3.6.8/fs/inode.
}
EXPORT_SYMBOL(inode_init_owner);
-diff -NurpP --minimal linux-3.10.19/fs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ioctl.c
---- linux-3.10.19/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ioctl.c
+--- linux-3.10.21/fs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -15,6 +15,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -3614,9 +3614,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ioctl.
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-3.10.19/fs/ioprio.c linux-3.10.19-vs2.3.6.8/fs/ioprio.c
---- linux-3.10.19/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ioprio.c linux-3.10.21-vs2.3.6.8/fs/ioprio.c
+--- linux-3.10.21/fs/ioprio.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ioprio.c 2013-08-22 20:29:59.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -3643,9 +3643,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ioprio.c linux-3.10.19-vs2.3.6.8/fs/iopri
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-3.10.19/fs/jfs/file.c linux-3.10.19-vs2.3.6.8/fs/jfs/file.c
---- linux-3.10.19/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/file.c linux-3.10.21-vs2.3.6.8/fs/jfs/file.c
+--- linux-3.10.21/fs/jfs/file.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
if (is_quota_modification(inode, iattr))
dquot_initialize(inode);
@@ -3664,9 +3664,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/file.c linux-3.10.19-vs2.3.6.8/fs/jfs
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.10.19/fs/jfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/jfs/ioctl.c
---- linux-3.10.19/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/ioctl.c linux-3.10.21-vs2.3.6.8/fs/jfs/ioctl.c
+--- linux-3.10.21/fs/jfs/ioctl.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -12,6 +12,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -3724,9 +3724,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/ioctl.c linux-3.10.19-vs2.3.6.8/fs/jf
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_dinode.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_dinode.h
---- linux-3.10.19/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_dinode.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_dinode.h
+--- linux-3.10.21/fs/jfs/jfs_dinode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_dinode.h 2013-08-22 20:29:59.000000000 +0000
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -3743,9 +3743,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_dinode.h linux-3.10.19-vs2.3.6.8/
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_filsys.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_filsys.h
---- linux-3.10.19/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_filsys.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_filsys.h
+--- linux-3.10.21/fs/jfs/jfs_filsys.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_filsys.h 2013-08-22 20:29:59.000000000 +0000
@@ -266,6 +266,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -3754,9 +3754,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_filsys.h linux-3.10.19-vs2.3.6.8/
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_imap.c linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_imap.c
---- linux-3.10.19/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_imap.c linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_imap.c
+--- linux-3.10.21/fs/jfs/jfs_imap.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_imap.c 2013-08-22 20:29:59.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/pagemap.h>
#include <linux/quotaops.h>
@@ -3820,9 +3820,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_imap.c linux-3.10.19-vs2.3.6.8/fs
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.c linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.c
---- linux-3.10.19/fs/jfs/jfs_inode.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_inode.c linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.c
+--- linux-3.10.21/fs/jfs/jfs_inode.c 2013-11-30 07:50:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.c 2013-11-13 17:22:25.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -3896,9 +3896,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.c linux-3.10.19-vs2.3.6.8/f
}
/*
-diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.h linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.h
---- linux-3.10.19/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/jfs_inode.h linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.h
+--- linux-3.10.21/fs/jfs/jfs_inode.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/jfs_inode.h 2013-08-22 20:29:59.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);
@@ -3907,9 +3907,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/jfs_inode.h linux-3.10.19-vs2.3.6.8/f
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern int jfs_setattr(struct dentry *, struct iattr *);
-diff -NurpP --minimal linux-3.10.19/fs/jfs/namei.c linux-3.10.19-vs2.3.6.8/fs/jfs/namei.c
---- linux-3.10.19/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/namei.c linux-3.10.21-vs2.3.6.8/fs/jfs/namei.c
+--- linux-3.10.21/fs/jfs/namei.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -3934,9 +3934,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/namei.c linux-3.10.19-vs2.3.6.8/fs/jf
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.10.19/fs/jfs/super.c linux-3.10.19-vs2.3.6.8/fs/jfs/super.c
---- linux-3.10.19/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/jfs/super.c linux-3.10.21-vs2.3.6.8/fs/jfs/super.c
+--- linux-3.10.21/fs/jfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/jfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -199,7 +199,8 @@ enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota,
@@ -4003,9 +4003,9 @@ diff -NurpP --minimal linux-3.10.19/fs/jfs/super.c linux-3.10.19-vs2.3.6.8/fs/jf
if (newLVSize) {
pr_err("resize option for remount only\n");
-diff -NurpP --minimal linux-3.10.19/fs/libfs.c linux-3.10.19-vs2.3.6.8/fs/libfs.c
---- linux-3.10.19/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/libfs.c linux-3.10.21-vs2.3.6.8/fs/libfs.c
+--- linux-3.10.21/fs/libfs.c 2013-02-19 13:58:48.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/libfs.c 2013-08-22 20:29:59.000000000 +0000
@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4051,9 +4051,9 @@ diff -NurpP --minimal linux-3.10.19/fs/libfs.c linux-3.10.19-vs2.3.6.8/fs/libfs.
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(mount_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.10.19/fs/locks.c linux-3.10.19-vs2.3.6.8/fs/locks.c
---- linux-3.10.19/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/locks.c linux-3.10.21-vs2.3.6.8/fs/locks.c
+--- linux-3.10.21/fs/locks.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/locks.c 2013-08-22 20:29:59.000000000 +0000
@@ -126,6 +126,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4251,9 +4251,9 @@ diff -NurpP --minimal linux-3.10.19/fs/locks.c linux-3.10.19-vs2.3.6.8/fs/locks.
return 0;
}
-diff -NurpP --minimal linux-3.10.19/fs/mount.h linux-3.10.19-vs2.3.6.8/fs/mount.h
---- linux-3.10.19/fs/mount.h 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/mount.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/mount.h linux-3.10.21-vs2.3.6.8/fs/mount.h
+--- linux-3.10.21/fs/mount.h 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/mount.h 2013-08-22 20:29:59.000000000 +0000
@@ -56,6 +56,7 @@ struct mount {
int mnt_expiry_mark; /* true if marked for expiry */
int mnt_pinned;
@@ -4262,9 +4262,9 @@ diff -NurpP --minimal linux-3.10.19/fs/mount.h linux-3.10.19-vs2.3.6.8/fs/mount.
};
#define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
-diff -NurpP --minimal linux-3.10.19/fs/namei.c linux-3.10.19-vs2.3.6.8/fs/namei.c
---- linux-3.10.19/fs/namei.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/namei.c 2013-08-22 23:36:09.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/namei.c linux-3.10.21-vs2.3.6.8/fs/namei.c
+--- linux-3.10.21/fs/namei.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/namei.c 2013-08-22 23:36:09.000000000 +0000
@@ -34,9 +34,19 @@
#include <linux/device_cgroup.h>
#include <linux/fs_struct.h>
@@ -4829,9 +4829,9 @@ diff -NurpP --minimal linux-3.10.19/fs/namei.c linux-3.10.19-vs2.3.6.8/fs/namei.
EXPORT_SYMBOL(dentry_unhash);
EXPORT_SYMBOL(generic_readlink);
+EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.10.19/fs/namespace.c linux-3.10.19-vs2.3.6.8/fs/namespace.c
---- linux-3.10.19/fs/namespace.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/namespace.c linux-3.10.21-vs2.3.6.8/fs/namespace.c
+--- linux-3.10.21/fs/namespace.c 2013-11-30 07:50:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/namespace.c 2013-11-13 17:17:16.000000000 +0000
@@ -23,6 +23,11 @@
#include <linux/uaccess.h>
#include <linux/proc_ns.h>
@@ -4976,9 +4976,9 @@ diff -NurpP --minimal linux-3.10.19/fs/namespace.c linux-3.10.19-vs2.3.6.8/fs/na
free_mnt_ns(ns);
}
-diff -NurpP --minimal linux-3.10.19/fs/nfs/client.c linux-3.10.19-vs2.3.6.8/fs/nfs/client.c
---- linux-3.10.19/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfs/client.c linux-3.10.21-vs2.3.6.8/fs/nfs/client.c
+--- linux-3.10.21/fs/nfs/client.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfs/client.c 2013-08-22 20:29:59.000000000 +0000
@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5000,9 +5000,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/client.c linux-3.10.19-vs2.3.6.8/fs/n
server->maxfilesize = fsinfo->maxfilesize;
server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.10.19/fs/nfs/dir.c linux-3.10.19-vs2.3.6.8/fs/nfs/dir.c
---- linux-3.10.19/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfs/dir.c linux-3.10.21-vs2.3.6.8/fs/nfs/dir.c
+--- linux-3.10.21/fs/nfs/dir.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfs/dir.c 2013-08-22 20:29:59.000000000 +0000
@@ -36,6 +36,7 @@
#include <linux/sched.h>
#include <linux/kmemleak.h>
@@ -5019,9 +5019,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/dir.c linux-3.10.19-vs2.3.6.8/fs/nfs/
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-3.10.19/fs/nfs/inode.c linux-3.10.19-vs2.3.6.8/fs/nfs/inode.c
---- linux-3.10.19/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfs/inode.c linux-3.10.21-vs2.3.6.8/fs/nfs/inode.c
+--- linux-3.10.21/fs/nfs/inode.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfs/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -39,6 +39,7 @@
#include <linux/compat.h>
#include <linux/freezer.h>
@@ -5148,9 +5148,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/inode.c linux-3.10.19-vs2.3.6.8/fs/nf
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.10.19/fs/nfs/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/nfs/nfs3xdr.c
---- linux-3.10.19/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfs/nfs3xdr.c linux-3.10.21-vs2.3.6.8/fs/nfs/nfs3xdr.c
+--- linux-3.10.21/fs/nfs/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfs/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -20,6 +20,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5296,9 +5296,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/
}
/*
-diff -NurpP --minimal linux-3.10.19/fs/nfs/super.c linux-3.10.19-vs2.3.6.8/fs/nfs/super.c
---- linux-3.10.19/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfs/super.c linux-3.10.21-vs2.3.6.8/fs/nfs/super.c
+--- linux-3.10.21/fs/nfs/super.c 2013-07-14 17:01:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfs/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/parser.h>
#include <linux/nsproxy.h>
@@ -5372,9 +5372,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfs/super.c linux-3.10.19-vs2.3.6.8/fs/nf
/*
* options that take text values
-diff -NurpP --minimal linux-3.10.19/fs/nfsd/auth.c linux-3.10.19-vs2.3.6.8/fs/nfsd/auth.c
---- linux-3.10.19/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfsd/auth.c linux-3.10.21-vs2.3.6.8/fs/nfsd/auth.c
+--- linux-3.10.21/fs/nfsd/auth.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfsd/auth.c 2013-08-22 20:29:59.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/sched.h>
@@ -5393,9 +5393,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/auth.c linux-3.10.19-vs2.3.6.8/fs/nf
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs3xdr.c
---- linux-3.10.19/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfs3xdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs3xdr.c
+--- linux-3.10.21/fs/nfsd/nfs3xdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs3xdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/namei.h>
@@ -5449,9 +5449,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs3xdr.c linux-3.10.19-vs2.3.6.8/fs
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs4xdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs4xdr.c
---- linux-3.10.19/fs/nfsd/nfs4xdr.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfs4xdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs4xdr.c
+--- linux-3.10.21/fs/nfsd/nfs4xdr.c 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfs4xdr.c 2013-11-13 17:17:16.000000000 +0000
@@ -46,6 +46,7 @@
#include <linux/utsname.h>
#include <linux/pagemap.h>
@@ -5481,9 +5481,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfs4xdr.c linux-3.10.19-vs2.3.6.8/fs
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfsxdr.c linux-3.10.19-vs2.3.6.8/fs/nfsd/nfsxdr.c
---- linux-3.10.19/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/nfsd/nfsxdr.c linux-3.10.21-vs2.3.6.8/fs/nfsd/nfsxdr.c
+--- linux-3.10.21/fs/nfsd/nfsxdr.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/nfsd/nfsxdr.c 2013-08-22 20:29:59.000000000 +0000
@@ -7,6 +7,7 @@
#include "vfs.h"
#include "xdr.h"
@@ -5535,9 +5535,9 @@ diff -NurpP --minimal linux-3.10.19/fs/nfsd/nfsxdr.c linux-3.10.19-vs2.3.6.8/fs/
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.c
---- linux-3.10.19/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/dlmglue.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.c
+--- linux-3.10.21/fs/ocfs2/dlmglue.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.c 2013-08-22 20:29:59.000000000 +0000
@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc
lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode));
@@ -5554,9 +5554,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.c linux-3.10.19-vs2.3.6.8/f
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.h
---- linux-3.10.19/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/dlmglue.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.h
+--- linux-3.10.21/fs/ocfs2/dlmglue.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/dlmglue.h 2013-08-22 20:29:59.000000000 +0000
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -5567,9 +5567,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/dlmglue.h linux-3.10.19-vs2.3.6.8/f
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/file.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/file.c
---- linux-3.10.19/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/file.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/file.c
+--- linux-3.10.21/fs/ocfs2/file.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/file.c 2013-08-22 20:29:59.000000000 +0000
@@ -1124,7 +1124,7 @@ int ocfs2_setattr(struct dentry *dentry,
attr->ia_valid &= ~ATTR_SIZE;
@@ -5579,9 +5579,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/file.c linux-3.10.19-vs2.3.6.8/fs/o
if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
return 0;
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.c
---- linux-3.10.19/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/inode.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.c
+--- linux-3.10.21/fs/ocfs2/inode.c 2013-05-31 13:45:24.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -28,6 +28,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -5678,9 +5678,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.c linux-3.10.19-vs2.3.6.8/fs/
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.h
---- linux-3.10.19/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/inode.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.h
+--- linux-3.10.21/fs/ocfs2/inode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/inode.h 2013-08-22 20:29:59.000000000 +0000
@@ -152,6 +152,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -5689,9 +5689,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/inode.h linux-3.10.19-vs2.3.6.8/fs/
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/ioctl.c
---- linux-3.10.19/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ioctl.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/ioctl.c
+--- linux-3.10.21/fs/ocfs2/ioctl.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ioctl.c 2013-08-22 20:29:59.000000000 +0000
@@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -5755,9 +5755,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ioctl.c linux-3.10.19-vs2.3.6.8/fs/
long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
struct inode *inode = file_inode(filp);
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/namei.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/namei.c
---- linux-3.10.19/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/namei.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/namei.c
+--- linux-3.10.21/fs/ocfs2/namei.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/namei.c 2013-08-22 20:29:59.000000000 +0000
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -5790,9 +5790,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/namei.c linux-3.10.19-vs2.3.6.8/fs/
fe->i_mode = cpu_to_le16(inode->i_mode);
if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2.h
---- linux-3.10.19/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ocfs2.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2.h
+--- linux-3.10.21/fs/ocfs2/ocfs2.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2.h 2013-08-22 20:29:59.000000000 +0000
@@ -272,6 +272,7 @@ enum ocfs2_mount_options
writes */
OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5801,9 +5801,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2.h linux-3.10.19-vs2.3.6.8/fs/
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2_fs.h linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
---- linux-3.10.19/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/ocfs2_fs.h linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h
+--- linux-3.10.21/fs/ocfs2/ocfs2_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/ocfs2_fs.h 2013-08-22 20:29:59.000000000 +0000
@@ -266,6 +266,11 @@
#define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/
#define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */
@@ -5816,9 +5816,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/ocfs2_fs.h linux-3.10.19-vs2.3.6.8/
#define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */
#define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */
-diff -NurpP --minimal linux-3.10.19/fs/ocfs2/super.c linux-3.10.19-vs2.3.6.8/fs/ocfs2/super.c
---- linux-3.10.19/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/ocfs2/super.c linux-3.10.21-vs2.3.6.8/fs/ocfs2/super.c
+--- linux-3.10.21/fs/ocfs2/super.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/ocfs2/super.c 2013-08-22 20:29:59.000000000 +0000
@@ -185,6 +185,7 @@ enum {
Opt_coherency_full,
Opt_resv_level,
@@ -5882,9 +5882,9 @@ diff -NurpP --minimal linux-3.10.19/fs/ocfs2/super.c linux-3.10.19-vs2.3.6.8/fs/
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.10.19/fs/open.c linux-3.10.19-vs2.3.6.8/fs/open.c
---- linux-3.10.19/fs/open.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/open.c linux-3.10.21-vs2.3.6.8/fs/open.c
+--- linux-3.10.21/fs/open.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/open.c 2013-08-22 20:29:59.000000000 +0000
@@ -31,6 +31,11 @@
#include <linux/ima.h>
#include <linux/dnotify.h>
@@ -5960,9 +5960,9 @@ diff -NurpP --minimal linux-3.10.19/fs/open.c linux-3.10.19-vs2.3.6.8/fs/open.c
error = chown_common(&path, user, group);
mnt_drop_write(path.mnt);
out_release:
-diff -NurpP --minimal linux-3.10.19/fs/proc/array.c linux-3.10.19-vs2.3.6.8/fs/proc/array.c
---- linux-3.10.19/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/array.c linux-3.10.21-vs2.3.6.8/fs/proc/array.c
+--- linux-3.10.21/fs/proc/array.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/array.c 2013-08-22 20:29:59.000000000 +0000
@@ -82,6 +82,8 @@
#include <linux/ptrace.h>
#include <linux/tracehook.h>
@@ -6076,9 +6076,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/array.c linux-3.10.19-vs2.3.6.8/fs/p
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
seq_put_decimal_ll(m, ' ', ppid);
seq_put_decimal_ll(m, ' ', pgid);
-diff -NurpP --minimal linux-3.10.19/fs/proc/base.c linux-3.10.19-vs2.3.6.8/fs/proc/base.c
---- linux-3.10.19/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/base.c linux-3.10.21-vs2.3.6.8/fs/proc/base.c
+--- linux-3.10.21/fs/proc/base.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/base.c 2013-08-22 22:18:21.000000000 +0000
@@ -87,6 +87,8 @@
#include <linux/slab.h>
#include <linux/flex_array.h>
@@ -6221,9 +6221,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/base.c linux-3.10.19-vs2.3.6.8/fs/pr
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-3.10.19/fs/proc/generic.c linux-3.10.19-vs2.3.6.8/fs/proc/generic.c
---- linux-3.10.19/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/generic.c linux-3.10.21-vs2.3.6.8/fs/proc/generic.c
+--- linux-3.10.21/fs/proc/generic.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/generic.c 2013-08-22 20:29:59.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -6285,9 +6285,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/generic.c linux-3.10.19-vs2.3.6.8/fs
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-3.10.19/fs/proc/inode.c linux-3.10.19-vs2.3.6.8/fs/proc/inode.c
---- linux-3.10.19/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/inode.c linux-3.10.21-vs2.3.6.8/fs/proc/inode.c
+--- linux-3.10.21/fs/proc/inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/inode.c 2013-08-22 20:29:59.000000000 +0000
@@ -387,6 +387,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6297,9 +6297,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/inode.c linux-3.10.19-vs2.3.6.8/fs/p
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-3.10.19/fs/proc/internal.h linux-3.10.19-vs2.3.6.8/fs/proc/internal.h
---- linux-3.10.19/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/internal.h linux-3.10.21-vs2.3.6.8/fs/proc/internal.h
+--- linux-3.10.21/fs/proc/internal.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/internal.h 2013-08-22 21:52:30.000000000 +0000
@@ -14,6 +14,7 @@
#include <linux/spinlock.h>
#include <linux/atomic.h>
@@ -6367,9 +6367,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/internal.h linux-3.10.19-vs2.3.6.8/f
/*
* base.c
-diff -NurpP --minimal linux-3.10.19/fs/proc/loadavg.c linux-3.10.19-vs2.3.6.8/fs/proc/loadavg.c
---- linux-3.10.19/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/loadavg.c linux-3.10.21-vs2.3.6.8/fs/proc/loadavg.c
+--- linux-3.10.21/fs/proc/loadavg.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/loadavg.c 2013-08-22 20:30:00.000000000 +0000
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6399,9 +6399,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/loadavg.c linux-3.10.19-vs2.3.6.8/fs
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-3.10.19/fs/proc/meminfo.c linux-3.10.19-vs2.3.6.8/fs/proc/meminfo.c
---- linux-3.10.19/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/meminfo.c linux-3.10.21-vs2.3.6.8/fs/proc/meminfo.c
+--- linux-3.10.21/fs/proc/meminfo.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/meminfo.c 2013-08-22 20:30:00.000000000 +0000
@@ -40,7 +40,8 @@ static int meminfo_proc_show(struct seq_
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6412,9 +6412,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/meminfo.c linux-3.10.19-vs2.3.6.8/fs
total_swapcache_pages() - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-3.10.19/fs/proc/root.c linux-3.10.19-vs2.3.6.8/fs/proc/root.c
---- linux-3.10.19/fs/proc/root.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/root.c linux-3.10.21-vs2.3.6.8/fs/proc/root.c
+--- linux-3.10.21/fs/proc/root.c 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/root.c 2013-11-13 17:19:37.000000000 +0000
@@ -20,9 +20,14 @@
#include <linux/mount.h>
#include <linux/pid_namespace.h>
@@ -6456,9 +6456,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/root.c linux-3.10.19-vs2.3.6.8/fs/pr
.name = "/proc",
};
-diff -NurpP --minimal linux-3.10.19/fs/proc/self.c linux-3.10.19-vs2.3.6.8/fs/proc/self.c
---- linux-3.10.19/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/self.c linux-3.10.21-vs2.3.6.8/fs/proc/self.c
+--- linux-3.10.21/fs/proc/self.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/self.c 2013-08-23 00:07:45.000000000 +0000
@@ -2,6 +2,7 @@
#include <linux/namei.h>
#include <linux/slab.h>
@@ -6476,9 +6476,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/self.c linux-3.10.19-vs2.3.6.8/fs/pr
if (inode) {
inode->i_ino = self_inum;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-3.10.19/fs/proc/stat.c linux-3.10.19-vs2.3.6.8/fs/proc/stat.c
---- linux-3.10.19/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/stat.c linux-3.10.21-vs2.3.6.8/fs/proc/stat.c
+--- linux-3.10.21/fs/proc/stat.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/stat.c 2013-08-22 20:30:00.000000000 +0000
@@ -9,8 +9,10 @@
#include <linux/slab.h>
#include <linux/time.h>
@@ -6527,9 +6527,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/stat.c linux-3.10.19-vs2.3.6.8/fs/pr
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kcpustat_cpu(i).cpustat[CPUTIME_USER];
nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
-diff -NurpP --minimal linux-3.10.19/fs/proc/uptime.c linux-3.10.19-vs2.3.6.8/fs/proc/uptime.c
---- linux-3.10.19/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc/uptime.c linux-3.10.21-vs2.3.6.8/fs/proc/uptime.c
+--- linux-3.10.21/fs/proc/uptime.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc/uptime.c 2013-08-22 20:30:00.000000000 +0000
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -6549,9 +6549,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc/uptime.c linux-3.10.19-vs2.3.6.8/fs/
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.10.19/fs/proc_namespace.c linux-3.10.19-vs2.3.6.8/fs/proc_namespace.c
---- linux-3.10.19/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/proc_namespace.c linux-3.10.21-vs2.3.6.8/fs/proc_namespace.c
+--- linux-3.10.21/fs/proc_namespace.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/proc_namespace.c 2013-08-22 20:30:00.000000000 +0000
@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file
{ MS_SYNCHRONOUS, ",sync" },
{ MS_DIRSYNC, ",dirsync" },
@@ -6667,9 +6667,9 @@ diff -NurpP --minimal linux-3.10.19/fs/proc_namespace.c linux-3.10.19-vs2.3.6.8/
/* file system type */
seq_puts(m, "with fstype ");
show_type(m, sb);
-diff -NurpP --minimal linux-3.10.19/fs/quota/dquot.c linux-3.10.19-vs2.3.6.8/fs/quota/dquot.c
---- linux-3.10.19/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/quota/dquot.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/quota/dquot.c linux-3.10.21-vs2.3.6.8/fs/quota/dquot.c
+--- linux-3.10.21/fs/quota/dquot.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/quota/dquot.c 2013-08-22 20:30:00.000000000 +0000
@@ -1585,6 +1585,9 @@ int __dquot_alloc_space(struct inode *in
struct dquot **dquots = inode->i_dquot;
int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6708,9 +6708,9 @@ diff -NurpP --minimal linux-3.10.19/fs/quota/dquot.c linux-3.10.19-vs2.3.6.8/fs/
/* First test before acquiring mutex - solves deadlocks when we
* re-enter the quota code and are already holding the mutex */
if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.10.19/fs/quota/quota.c linux-3.10.19-vs2.3.6.8/fs/quota/quota.c
---- linux-3.10.19/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/quota/quota.c linux-3.10.21-vs2.3.6.8/fs/quota/quota.c
+--- linux-3.10.21/fs/quota/quota.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/quota/quota.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#include <linux/fs.h>
#include <linux/namei.h>
@@ -6798,9 +6798,9 @@ diff -NurpP --minimal linux-3.10.19/fs/quota/quota.c linux-3.10.19-vs2.3.6.8/fs/
if (quotactl_cmd_write(cmd))
sb = get_super_thawed(bdev);
else
-diff -NurpP --minimal linux-3.10.19/fs/stat.c linux-3.10.19-vs2.3.6.8/fs/stat.c
---- linux-3.10.19/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/stat.c linux-3.10.21-vs2.3.6.8/fs/stat.c
+--- linux-3.10.21/fs/stat.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/stat.c 2013-08-22 20:30:00.000000000 +0000
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -6809,9 +6809,9 @@ diff -NurpP --minimal linux-3.10.19/fs/stat.c linux-3.10.19-vs2.3.6.8/fs/stat.c
stat->rdev = inode->i_rdev;
stat->size = i_size_read(inode);
stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.10.19/fs/statfs.c linux-3.10.19-vs2.3.6.8/fs/statfs.c
---- linux-3.10.19/fs/statfs.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/statfs.c linux-3.10.21-vs2.3.6.8/fs/statfs.c
+--- linux-3.10.21/fs/statfs.c 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/statfs.c 2013-11-13 17:17:16.000000000 +0000
@@ -7,6 +7,8 @@
#include <linux/statfs.h>
#include <linux/security.h>
@@ -6830,9 +6830,9 @@ diff -NurpP --minimal linux-3.10.19/fs/statfs.c linux-3.10.19-vs2.3.6.8/fs/statf
return retval;
}
-diff -NurpP --minimal linux-3.10.19/fs/super.c linux-3.10.19-vs2.3.6.8/fs/super.c
---- linux-3.10.19/fs/super.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/super.c linux-3.10.21-vs2.3.6.8/fs/super.c
+--- linux-3.10.21/fs/super.c 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/super.c 2013-11-13 17:17:16.000000000 +0000
@@ -34,6 +34,8 @@
#include <linux/cleancache.h>
#include <linux/fsnotify.h>
@@ -6856,9 +6856,9 @@ diff -NurpP --minimal linux-3.10.19/fs/super.c linux-3.10.19-vs2.3.6.8/fs/super.
error = security_sb_kern_mount(sb, flags, secdata);
if (error)
goto out_sb;
-diff -NurpP --minimal linux-3.10.19/fs/sysfs/mount.c linux-3.10.19-vs2.3.6.8/fs/sysfs/mount.c
---- linux-3.10.19/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/sysfs/mount.c linux-3.10.21-vs2.3.6.8/fs/sysfs/mount.c
+--- linux-3.10.21/fs/sysfs/mount.c 2013-05-31 13:45:25.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/sysfs/mount.c 2013-08-22 20:30:00.000000000 +0000
@@ -48,7 +48,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -6868,9 +6868,9 @@ diff -NurpP --minimal linux-3.10.19/fs/sysfs/mount.c linux-3.10.19-vs2.3.6.8/fs/
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-3.10.19/fs/utimes.c linux-3.10.19-vs2.3.6.8/fs/utimes.c
---- linux-3.10.19/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/utimes.c linux-3.10.21-vs2.3.6.8/fs/utimes.c
+--- linux-3.10.21/fs/utimes.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/utimes.c 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -6900,9 +6900,9 @@ diff -NurpP --minimal linux-3.10.19/fs/utimes.c linux-3.10.19-vs2.3.6.8/fs/utime
if (times && times[0].tv_nsec == UTIME_NOW &&
times[1].tv_nsec == UTIME_NOW)
times = NULL;
-diff -NurpP --minimal linux-3.10.19/fs/xattr.c linux-3.10.19-vs2.3.6.8/fs/xattr.c
---- linux-3.10.19/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xattr.c linux-3.10.21-vs2.3.6.8/fs/xattr.c
+--- linux-3.10.21/fs/xattr.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xattr.c 2013-08-22 20:30:00.000000000 +0000
@@ -21,6 +21,7 @@
#include <linux/audit.h>
#include <linux/vmalloc.h>
@@ -6920,9 +6920,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xattr.c linux-3.10.19-vs2.3.6.8/fs/xattr.
return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
return 0;
}
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_dinode.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_dinode.h
---- linux-3.10.19/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_dinode.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_dinode.h
+--- linux-3.10.21/fs/xfs/xfs_dinode.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_dinode.h 2013-08-22 20:30:00.000000000 +0000
@@ -51,7 +51,9 @@ typedef struct xfs_dinode {
__be32 di_nlink; /* number of links to file */
__be16 di_projid_lo; /* lower part of owner's project id */
@@ -6963,9 +6963,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_dinode.h linux-3.10.19-vs2.3.6.8/
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_fs.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_fs.h
---- linux-3.10.19/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_fs.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_fs.h
+--- linux-3.10.21/fs/xfs/xfs_fs.h 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -67,6 +67,9 @@ struct fsxattr {
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
#define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */
@@ -6986,9 +6986,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_fs.h linux-3.10.19-vs2.3.6.8/fs/x
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ialloc.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ialloc.c
---- linux-3.10.19/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ialloc.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ialloc.c
+--- linux-3.10.21/fs/xfs/xfs_ialloc.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ialloc.c 2013-08-22 20:30:00.000000000 +0000
@@ -39,7 +39,6 @@
#include "xfs_cksum.h"
#include "xfs_buf_item.h"
@@ -6997,9 +6997,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ialloc.c linux-3.10.19-vs2.3.6.8/
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.c
---- linux-3.10.19/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_inode.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.c
+--- linux-3.10.21/fs/xfs/xfs_inode.c 2013-07-14 17:01:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.c 2013-08-22 21:50:34.000000000 +0000
@@ -16,6 +16,7 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -7177,9 +7177,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.c linux-3.10.19-vs2.3.6.8/f
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.h
---- linux-3.10.19/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_inode.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.h
+--- linux-3.10.21/fs/xfs/xfs_inode.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_inode.h 2013-08-22 20:30:00.000000000 +0000
@@ -134,7 +134,9 @@ typedef struct xfs_icdinode {
__uint32_t di_nlink; /* number of links to file */
__uint16_t di_projid_lo; /* lower part of owner's project id */
@@ -7200,9 +7200,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_inode.h linux-3.10.19-vs2.3.6.8/f
void xfs_idestroy_fork(struct xfs_inode *, int);
void xfs_idata_realloc(struct xfs_inode *, int, int);
void xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.c
---- linux-3.10.19/fs/xfs/xfs_ioctl.c 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ioctl.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.c
+--- linux-3.10.21/fs/xfs/xfs_ioctl.c 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.c 2013-08-22 20:30:00.000000000 +0000
@@ -26,7 +26,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7271,9 +7271,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.c linux-3.10.19-vs2.3.6.8/f
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.h
---- linux-3.10.19/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_ioctl.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.h
+--- linux-3.10.21/fs/xfs/xfs_ioctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_ioctl.h 2013-08-22 20:30:00.000000000 +0000
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7287,9 +7287,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_ioctl.h linux-3.10.19-vs2.3.6.8/f
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_iops.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_iops.c
---- linux-3.10.19/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_iops.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_iops.c
+--- linux-3.10.21/fs/xfs/xfs_iops.c 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_iops.c 2013-08-22 20:30:00.000000000 +0000
@@ -28,6 +28,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_dinode.h"
@@ -7365,9 +7365,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_iops.c linux-3.10.19-vs2.3.6.8/fs
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_itable.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_itable.c
---- linux-3.10.19/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_itable.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_itable.c
+--- linux-3.10.21/fs/xfs/xfs_itable.c 2013-02-19 13:58:49.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_itable.c 2013-08-22 20:30:00.000000000 +0000
@@ -97,6 +97,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -7376,9 +7376,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_itable.c linux-3.10.19-vs2.3.6.8/
buf->bs_size = dic->di_size;
buf->bs_atime.tv_sec = dic->di_atime.t_sec;
buf->bs_atime.tv_nsec = dic->di_atime.t_nsec;
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_linux.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_linux.h
---- linux-3.10.19/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_linux.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_linux.h
+--- linux-3.10.21/fs/xfs/xfs_linux.h 2013-07-14 17:01:30.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_linux.h 2013-08-22 20:30:00.000000000 +0000
@@ -124,6 +124,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7387,9 +7387,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_linux.h linux-3.10.19-vs2.3.6.8/f
#define current_test_flags(f) (current->flags & (f))
#define current_set_flags_nested(sp, f) \
(*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_log_recover.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_log_recover.c
---- linux-3.10.19/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_log_recover.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_log_recover.c
+--- linux-3.10.21/fs/xfs/xfs_log_recover.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_log_recover.c 2013-08-22 21:48:01.000000000 +0000
@@ -2662,7 +2662,7 @@ xlog_recover_inode_pass2(
}
@@ -7399,9 +7399,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_log_recover.c linux-3.10.19-vs2.3
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > isize) {
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_mount.h linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_mount.h
---- linux-3.10.19/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_mount.h linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_mount.h
+--- linux-3.10.21/fs/xfs/xfs_mount.h 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -253,6 +253,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -7410,9 +7410,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_mount.h linux-3.10.19-vs2.3.6.8/f
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_super.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_super.c
---- linux-3.10.19/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_super.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_super.c
+--- linux-3.10.21/fs/xfs/xfs_super.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_super.c 2013-08-22 20:30:00.000000000 +0000
@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */
#define MNTOPT_DISCARD "discard" /* Discard unused blocks */
@@ -7489,9 +7489,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_super.c linux-3.10.19-vs2.3.6.8/f
/*
* we must configure the block size in the superblock before we run the
* full mount process as the mount process can lookup and cache inodes.
-diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_vnodeops.c linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
---- linux-3.10.19/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/fs/xfs/xfs_vnodeops.c linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_vnodeops.c
+--- linux-3.10.21/fs/xfs/xfs_vnodeops.c 2013-07-14 17:01:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/fs/xfs/xfs_vnodeops.c 2013-08-22 20:30:00.000000000 +0000
@@ -155,6 +155,77 @@ xfs_free_eofblocks(
return error;
}
@@ -7570,9 +7570,9 @@ diff -NurpP --minimal linux-3.10.19/fs/xfs/xfs_vnodeops.c linux-3.10.19-vs2.3.6.
int
xfs_release(
xfs_inode_t *ip)
-diff -NurpP --minimal linux-3.10.19/include/linux/cred.h linux-3.10.19-vs2.3.6.8/include/linux/cred.h
---- linux-3.10.19/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/cred.h linux-3.10.21-vs2.3.6.8/include/linux/cred.h
+--- linux-3.10.21/include/linux/cred.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/cred.h 2013-08-22 20:30:00.000000000 +0000
@@ -143,6 +143,7 @@ extern void exit_creds(struct task_struc
extern int copy_creds(struct task_struct *, unsigned long);
extern const struct cred *get_task_cred(struct task_struct *);
@@ -7613,18 +7613,18 @@ diff -NurpP --minimal linux-3.10.19/include/linux/cred.h linux-3.10.19-vs2.3.6.8
/**
* get_new_cred - Get a reference on a new set of credentials
* @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.10.19/include/linux/devpts_fs.h linux-3.10.19-vs2.3.6.8/include/linux/devpts_fs.h
---- linux-3.10.19/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/devpts_fs.h linux-3.10.21-vs2.3.6.8/include/linux/devpts_fs.h
+--- linux-3.10.21/include/linux/devpts_fs.h 2013-02-19 13:58:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/devpts_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/fs.h linux-3.10.19-vs2.3.6.8/include/linux/fs.h
---- linux-3.10.19/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/fs.h linux-3.10.21-vs2.3.6.8/include/linux/fs.h
+--- linux-3.10.21/include/linux/fs.h 2013-07-14 17:01:32.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -211,6 +211,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define ATTR_KILL_PRIV (1 << 14)
#define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */
@@ -7790,9 +7790,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/fs.h linux-3.10.19-vs2.3.6.8/i
extern int simple_setattr(struct dentry *, struct iattr *);
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.10.19/include/linux/init_task.h linux-3.10.19-vs2.3.6.8/include/linux/init_task.h
---- linux-3.10.19/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/init_task.h linux-3.10.21-vs2.3.6.8/include/linux/init_task.h
+--- linux-3.10.21/include/linux/init_task.h 2013-05-31 13:45:27.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/init_task.h 2013-08-22 20:30:00.000000000 +0000
@@ -222,6 +222,10 @@ extern struct task_group root_task_group
INIT_TASK_RCU_PREEMPT(tsk) \
INIT_CPUSET_SEQ \
@@ -7804,9 +7804,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/init_task.h linux-3.10.19-vs2.
}
-diff -NurpP --minimal linux-3.10.19/include/linux/ipc.h linux-3.10.19-vs2.3.6.8/include/linux/ipc.h
---- linux-3.10.19/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/ipc.h linux-3.10.21-vs2.3.6.8/include/linux/ipc.h
+--- linux-3.10.21/include/linux/ipc.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/ipc.h 2013-08-22 20:30:00.000000000 +0000
@@ -16,6 +16,7 @@ struct kern_ipc_perm
key_t key;
kuid_t uid;
@@ -7815,9 +7815,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/ipc.h linux-3.10.19-vs2.3.6.8/
kuid_t cuid;
kgid_t cgid;
umode_t mode;
-diff -NurpP --minimal linux-3.10.19/include/linux/loop.h linux-3.10.19-vs2.3.6.8/include/linux/loop.h
---- linux-3.10.19/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/loop.h linux-3.10.21-vs2.3.6.8/include/linux/loop.h
+--- linux-3.10.21/include/linux/loop.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/loop.h 2013-08-22 20:30:00.000000000 +0000
@@ -41,6 +41,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -7826,9 +7826,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/loop.h linux-3.10.19-vs2.3.6.8
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-3.10.19/include/linux/memcontrol.h linux-3.10.19-vs2.3.6.8/include/linux/memcontrol.h
---- linux-3.10.19/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/memcontrol.h linux-3.10.21-vs2.3.6.8/include/linux/memcontrol.h
+--- linux-3.10.21/include/linux/memcontrol.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/memcontrol.h 2013-08-22 20:30:00.000000000 +0000
@@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);
extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);
@@ -7843,9 +7843,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/memcontrol.h linux-3.10.19-vs2
static inline
bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg)
{
-diff -NurpP --minimal linux-3.10.19/include/linux/mm_types.h linux-3.10.19-vs2.3.6.8/include/linux/mm_types.h
---- linux-3.10.19/include/linux/mm_types.h 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/mm_types.h 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/mm_types.h linux-3.10.21-vs2.3.6.8/include/linux/mm_types.h
+--- linux-3.10.21/include/linux/mm_types.h 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/mm_types.h 2013-11-13 17:17:16.000000000 +0000
@@ -381,6 +381,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -7854,9 +7854,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/mm_types.h linux-3.10.19-vs2.3
unsigned long flags; /* Must use atomic bitops to access the bits */
-diff -NurpP --minimal linux-3.10.19/include/linux/mount.h linux-3.10.19-vs2.3.6.8/include/linux/mount.h
---- linux-3.10.19/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/mount.h linux-3.10.21-vs2.3.6.8/include/linux/mount.h
+--- linux-3.10.21/include/linux/mount.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -49,6 +49,9 @@ struct mnt_namespace;
#define MNT_LOCK_READONLY 0x400000
@@ -7867,9 +7867,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/mount.h linux-3.10.19-vs2.3.6.
struct vfsmount {
struct dentry *mnt_root; /* root of the mounted tree */
struct super_block *mnt_sb; /* pointer to superblock */
-diff -NurpP --minimal linux-3.10.19/include/linux/net.h linux-3.10.19-vs2.3.6.8/include/linux/net.h
---- linux-3.10.19/include/linux/net.h 2013-07-14 17:01:32.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/net.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/net.h linux-3.10.21-vs2.3.6.8/include/linux/net.h
+--- linux-3.10.21/include/linux/net.h 2013-07-14 17:01:32.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/net.h 2013-08-22 20:30:00.000000000 +0000
@@ -38,6 +38,7 @@ struct net;
#define SOCK_PASSCRED 3
#define SOCK_PASSSEC 4
@@ -7878,9 +7878,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/net.h linux-3.10.19-vs2.3.6.8/
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-3.10.19/include/linux/netdevice.h linux-3.10.19-vs2.3.6.8/include/linux/netdevice.h
---- linux-3.10.19/include/linux/netdevice.h 2013-07-14 17:01:32.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/netdevice.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/netdevice.h linux-3.10.21-vs2.3.6.8/include/linux/netdevice.h
+--- linux-3.10.21/include/linux/netdevice.h 2013-07-14 17:01:32.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/netdevice.h 2013-08-22 20:30:00.000000000 +0000
@@ -1694,6 +1694,7 @@ extern int init_dummy_netdev(struct net
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
@@ -7889,9 +7889,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/netdevice.h linux-3.10.19-vs2.
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
extern int netdev_get_name(struct net *net, char *name, int ifindex);
extern int dev_restart(struct net_device *dev);
-diff -NurpP --minimal linux-3.10.19/include/linux/nsproxy.h linux-3.10.19-vs2.3.6.8/include/linux/nsproxy.h
---- linux-3.10.19/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/nsproxy.h linux-3.10.21-vs2.3.6.8/include/linux/nsproxy.h
+--- linux-3.10.21/include/linux/nsproxy.h 2013-02-19 13:58:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/nsproxy.h 2013-08-22 20:30:00.000000000 +0000
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -7941,9 +7941,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/nsproxy.h linux-3.10.19-vs2.3.
}
#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/pid.h linux-3.10.19-vs2.3.6.8/include/linux/pid.h
---- linux-3.10.19/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/pid.h linux-3.10.21-vs2.3.6.8/include/linux/pid.h
+--- linux-3.10.21/include/linux/pid.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -7962,9 +7962,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/pid.h linux-3.10.19-vs2.3.6.8/
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-3.10.19/include/linux/quotaops.h linux-3.10.19-vs2.3.6.8/include/linux/quotaops.h
---- linux-3.10.19/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/quotaops.h linux-3.10.21-vs2.3.6.8/include/linux/quotaops.h
+--- linux-3.10.21/include/linux/quotaops.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/quotaops.h 2013-08-22 20:30:00.000000000 +0000
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -8006,10 +8006,10 @@ diff -NurpP --minimal linux-3.10.19/include/linux/quotaops.h linux-3.10.19-vs2.3
}
static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.8/include/linux/sched.h
---- linux-3.10.19/include/linux/sched.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/sched.h 2013-10-09 17:37:22.000000000 +0000
-@@ -1233,6 +1233,14 @@ struct task_struct {
+diff -NurpP --minimal linux-3.10.21/include/linux/sched.h linux-3.10.21-vs2.3.6.8/include/linux/sched.h
+--- linux-3.10.21/include/linux/sched.h 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/sched.h 2013-11-30 07:53:00.000000000 +0000
+@@ -1237,6 +1237,14 @@ struct task_struct {
#endif
struct seccomp seccomp;
@@ -8024,7 +8024,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1476,6 +1484,11 @@ struct pid_namespace;
+@@ -1480,6 +1488,11 @@ struct pid_namespace;
pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
struct pid_namespace *ns);
@@ -8036,7 +8036,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
static inline pid_t task_pid_nr(struct task_struct *tsk)
{
return tsk->pid;
-@@ -1489,7 +1502,8 @@ static inline pid_t task_pid_nr_ns(struc
+@@ -1493,7 +1506,8 @@ static inline pid_t task_pid_nr_ns(struc
static inline pid_t task_pid_vnr(struct task_struct *tsk)
{
@@ -8046,7 +8046,7 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
}
-@@ -1502,7 +1516,7 @@ pid_t task_tgid_nr_ns(struct task_struct
+@@ -1506,7 +1520,7 @@ pid_t task_tgid_nr_ns(struct task_struct
static inline pid_t task_tgid_vnr(struct task_struct *tsk)
{
@@ -8055,9 +8055,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sched.h linux-3.10.19-vs2.3.6.
}
-diff -NurpP --minimal linux-3.10.19/include/linux/shmem_fs.h linux-3.10.19-vs2.3.6.8/include/linux/shmem_fs.h
---- linux-3.10.19/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/shmem_fs.h linux-3.10.21-vs2.3.6.8/include/linux/shmem_fs.h
+--- linux-3.10.21/include/linux/shmem_fs.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/shmem_fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -9,6 +9,9 @@
/* inode in-kernel data */
@@ -8068,9 +8068,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/shmem_fs.h linux-3.10.19-vs2.3
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-3.10.19/include/linux/stat.h linux-3.10.19-vs2.3.6.8/include/linux/stat.h
---- linux-3.10.19/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/stat.h linux-3.10.21-vs2.3.6.8/include/linux/stat.h
+--- linux-3.10.21/include/linux/stat.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/stat.h 2013-08-22 20:30:00.000000000 +0000
@@ -25,6 +25,7 @@ struct kstat {
unsigned int nlink;
kuid_t uid;
@@ -8079,9 +8079,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/stat.h linux-3.10.19-vs2.3.6.8
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/auth.h linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/auth.h
---- linux-3.10.19/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/sunrpc/auth.h linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/auth.h
+--- linux-3.10.21/include/linux/sunrpc/auth.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/auth.h 2013-08-22 20:30:00.000000000 +0000
@@ -28,6 +28,7 @@ struct rpcsec_gss_info;
struct auth_cred {
kuid_t uid;
@@ -8090,9 +8090,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/auth.h linux-3.10.19-vs
struct group_info *group_info;
const char *principal;
unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/clnt.h linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/clnt.h
---- linux-3.10.19/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/sunrpc/clnt.h linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/clnt.h
+--- linux-3.10.21/include/linux/sunrpc/clnt.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/sunrpc/clnt.h 2013-08-22 20:30:00.000000000 +0000
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -8103,9 +8103,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sunrpc/clnt.h linux-3.10.19-vs
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-3.10.19/include/linux/sysfs.h linux-3.10.19-vs2.3.6.8/include/linux/sysfs.h
---- linux-3.10.19/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/sysfs.h linux-3.10.21-vs2.3.6.8/include/linux/sysfs.h
+--- linux-3.10.21/include/linux/sysfs.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/sysfs.h 2013-08-22 20:30:00.000000000 +0000
@@ -19,6 +19,8 @@
#include <linux/kobject_ns.h>
#include <linux/atomic.h>
@@ -8115,9 +8115,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/sysfs.h linux-3.10.19-vs2.3.6.
struct kobject;
struct module;
enum kobj_ns_type;
-diff -NurpP --minimal linux-3.10.19/include/linux/types.h linux-3.10.19-vs2.3.6.8/include/linux/types.h
---- linux-3.10.19/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/types.h linux-3.10.21-vs2.3.6.8/include/linux/types.h
+--- linux-3.10.21/include/linux/types.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/types.h 2013-08-22 20:30:00.000000000 +0000
@@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -8128,9 +8128,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/types.h linux-3.10.19-vs2.3.6.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-3.10.19/include/linux/uidgid.h linux-3.10.19-vs2.3.6.8/include/linux/uidgid.h
---- linux-3.10.19/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/uidgid.h linux-3.10.21-vs2.3.6.8/include/linux/uidgid.h
+--- linux-3.10.21/include/linux/uidgid.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/uidgid.h 2013-08-22 20:30:00.000000000 +0000
@@ -23,13 +23,17 @@ typedef struct {
uid_t val;
} kuid_t;
@@ -8250,9 +8250,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/uidgid.h linux-3.10.19-vs2.3.6
static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid)
{
uid_t uid = from_kuid(to, kuid);
-diff -NurpP --minimal linux-3.10.19/include/linux/vroot.h linux-3.10.19-vs2.3.6.8/include/linux/vroot.h
---- linux-3.10.19/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vroot.h linux-3.10.21-vs2.3.6.8/include/linux/vroot.h
+--- linux-3.10.21/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vroot.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,51 @@
+
+/*
@@ -8305,9 +8305,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vroot.h linux-3.10.19-vs2.3.6.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_base.h linux-3.10.19-vs2.3.6.8/include/linux/vs_base.h
---- linux-3.10.19/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_base.h linux-3.10.21-vs2.3.6.8/include/linux/vs_base.h
+--- linux-3.10.21/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_base.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -8319,9 +8319,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_base.h linux-3.10.19-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_context.h linux-3.10.19-vs2.3.6.8/include/linux/vs_context.h
---- linux-3.10.19/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_context.h linux-3.10.21-vs2.3.6.8/include/linux/vs_context.h
+--- linux-3.10.21/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_context.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -8565,9 +8565,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_context.h linux-3.10.19-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_cowbl.h linux-3.10.19-vs2.3.6.8/include/linux/vs_cowbl.h
---- linux-3.10.19/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_cowbl.h linux-3.10.21-vs2.3.6.8/include/linux/vs_cowbl.h
+--- linux-3.10.21/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_cowbl.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,48 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -8617,9 +8617,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_cowbl.h linux-3.10.19-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_cvirt.h linux-3.10.19-vs2.3.6.8/include/linux/vs_cvirt.h
---- linux-3.10.19/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_cvirt.h linux-3.10.21-vs2.3.6.8/include/linux/vs_cvirt.h
+--- linux-3.10.21/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_cvirt.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -8671,9 +8671,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_cvirt.h linux-3.10.19-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_device.h linux-3.10.19-vs2.3.6.8/include/linux/vs_device.h
---- linux-3.10.19/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_device.h linux-3.10.21-vs2.3.6.8/include/linux/vs_device.h
+--- linux-3.10.21/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -8720,9 +8720,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_device.h linux-3.10.19-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_dlimit.h linux-3.10.19-vs2.3.6.8/include/linux/vs_dlimit.h
---- linux-3.10.19/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_dlimit.h linux-3.10.21-vs2.3.6.8/include/linux/vs_dlimit.h
+--- linux-3.10.21/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -8939,9 +8939,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_dlimit.h linux-3.10.19-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet.h linux-3.10.19-vs2.3.6.8/include/linux/vs_inet.h
---- linux-3.10.19/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_inet.h linux-3.10.21-vs2.3.6.8/include/linux/vs_inet.h
+--- linux-3.10.21/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_inet.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,364 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -9307,9 +9307,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet.h linux-3.10.19-vs2.3.
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet6.h linux-3.10.19-vs2.3.6.8/include/linux/vs_inet6.h
---- linux-3.10.19/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_inet6.h linux-3.10.21-vs2.3.6.8/include/linux/vs_inet6.h
+--- linux-3.10.21/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_inet6.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,257 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -9568,9 +9568,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_inet6.h linux-3.10.19-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_limit.h linux-3.10.19-vs2.3.6.8/include/linux/vs_limit.h
---- linux-3.10.19/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_limit.h linux-3.10.21-vs2.3.6.8/include/linux/vs_limit.h
+--- linux-3.10.21/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -9712,9 +9712,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_limit.h linux-3.10.19-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_network.h linux-3.10.19-vs2.3.6.8/include/linux/vs_network.h
---- linux-3.10.19/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_network.h linux-3.10.21-vs2.3.6.8/include/linux/vs_network.h
+--- linux-3.10.21/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -9885,9 +9885,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_network.h linux-3.10.19-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_pid.h linux-3.10.19-vs2.3.6.8/include/linux/vs_pid.h
---- linux-3.10.19/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_pid.h linux-3.10.21-vs2.3.6.8/include/linux/vs_pid.h
+--- linux-3.10.21/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -9939,9 +9939,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_pid.h linux-3.10.19-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_sched.h linux-3.10.19-vs2.3.6.8/include/linux/vs_sched.h
---- linux-3.10.19/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_sched.h linux-3.10.21-vs2.3.6.8/include/linux/vs_sched.h
+--- linux-3.10.21/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_sched.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -9983,9 +9983,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_sched.h linux-3.10.19-vs2.3
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_socket.h linux-3.10.19-vs2.3.6.8/include/linux/vs_socket.h
---- linux-3.10.19/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_socket.h linux-3.10.21-vs2.3.6.8/include/linux/vs_socket.h
+--- linux-3.10.21/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_socket.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -10054,9 +10054,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_socket.h linux-3.10.19-vs2.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_tag.h linux-3.10.19-vs2.3.6.8/include/linux/vs_tag.h
---- linux-3.10.19/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_tag.h linux-3.10.21-vs2.3.6.8/include/linux/vs_tag.h
+--- linux-3.10.21/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_tag.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -10105,9 +10105,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_tag.h linux-3.10.19-vs2.3.6
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vs_time.h linux-3.10.19-vs2.3.6.8/include/linux/vs_time.h
---- linux-3.10.19/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vs_time.h linux-3.10.21-vs2.3.6.8/include/linux/vs_time.h
+--- linux-3.10.21/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vs_time.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -10128,9 +10128,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vs_time.h linux-3.10.19-vs2.3.
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/base.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/base.h
---- linux-3.10.19/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/base.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/base.h
+--- linux-3.10.21/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/base.h 2013-10-27 03:40:46.000000000 +0000
@@ -0,0 +1,184 @@
+#ifndef _VSERVER_BASE_H
+#define _VSERVER_BASE_H
@@ -10316,9 +10316,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/base.h linux-3.10.19-v
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct.h
---- linux-3.10.19/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct.h
+--- linux-3.10.21/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _VSERVER_CACCT_H
+#define _VSERVER_CACCT_H
@@ -10335,9 +10335,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct.h linux-3.10.19-
+};
+
+#endif /* _VSERVER_CACCT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
---- linux-3.10.19/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_cmd.h
+--- linux-3.10.21/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_CACCT_CMD_H
+#define _VSERVER_CACCT_CMD_H
@@ -10349,9 +10349,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_cmd.h linux-3.10
+extern int vc_sock_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_def.h
---- linux-3.10.19/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_def.h
+--- linux-3.10.21/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,43 @@
+#ifndef _VSERVER_CACCT_DEF_H
+#define _VSERVER_CACCT_DEF_H
@@ -10396,9 +10396,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_int.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_int.h
---- linux-3.10.19/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cacct_int.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_int.h
+--- linux-3.10.21/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cacct_int.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_CACCT_INT_H
+#define _VSERVER_CACCT_INT_H
@@ -10417,9 +10417,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cacct_int.h linux-3.10
+}
+
+#endif /* _VSERVER_CACCT_INT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/check.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/check.h
---- linux-3.10.19/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/check.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/check.h
+--- linux-3.10.21/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/check.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,89 @@
+#ifndef _VSERVER_CHECK_H
+#define _VSERVER_CHECK_H
@@ -10510,9 +10510,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/check.h linux-3.10.19-
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/context.h
---- linux-3.10.19/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/context.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/context.h
+--- linux-3.10.21/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/context.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,110 @@
+#ifndef _VSERVER_CONTEXT_H
+#define _VSERVER_CONTEXT_H
@@ -10624,9 +10624,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context.h linux-3.10.1
+
+
+#endif /* _VSERVER_CONTEXT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/context_cmd.h
---- linux-3.10.19/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/context_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/context_cmd.h
+--- linux-3.10.21/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,33 @@
+#ifndef _VSERVER_CONTEXT_CMD_H
+#define _VSERVER_CONTEXT_CMD_H
@@ -10661,9 +10661,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/context_cmd.h linux-3.
+extern int vc_set_badness(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt.h
---- linux-3.10.19/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt.h
+--- linux-3.10.21/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,18 @@
+#ifndef _VSERVER_CVIRT_H
+#define _VSERVER_CVIRT_H
@@ -10683,9 +10683,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt.h linux-3.10.19-
+int vx_do_syslog(int, char __user *, int);
+
+#endif /* _VSERVER_CVIRT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
---- linux-3.10.19/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h
+--- linux-3.10.21/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_CVIRT_CMD_H
+#define _VSERVER_CVIRT_CMD_H
@@ -10700,9 +10700,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_cmd.h linux-3.10
+extern int vc_virt_stat(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_def.h
---- linux-3.10.19/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/cvirt_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_def.h
+--- linux-3.10.21/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/cvirt_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef _VSERVER_CVIRT_DEF_H
+#define _VSERVER_CVIRT_DEF_H
@@ -10784,9 +10784,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/cvirt_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug.h
---- linux-3.10.19/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/debug.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug.h
+--- linux-3.10.21/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,146 @@
+#ifndef _VSERVER_DEBUG_H
+#define _VSERVER_DEBUG_H
@@ -10934,9 +10934,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug.h linux-3.10.19-
+
+
+#endif /* _VSERVER_DEBUG_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug_cmd.h
---- linux-3.10.19/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/debug_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug_cmd.h
+--- linux-3.10.21/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_DEBUG_CMD_H
+#define _VSERVER_DEBUG_CMD_H
@@ -10975,9 +10975,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/debug_cmd.h linux-3.10
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device.h
---- linux-3.10.19/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device.h
+--- linux-3.10.21/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _VSERVER_DEVICE_H
+#define _VSERVER_DEVICE_H
@@ -10988,9 +10988,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device.h linux-3.10.19
+#else /* _VSERVER_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DEVICE_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_cmd.h
---- linux-3.10.19/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_cmd.h
+--- linux-3.10.21/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _VSERVER_DEVICE_CMD_H
+#define _VSERVER_DEVICE_CMD_H
@@ -11023,9 +11023,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_cmd.h linux-3.1
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_def.h
---- linux-3.10.19/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/device_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_def.h
+--- linux-3.10.21/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/device_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef _VSERVER_DEVICE_DEF_H
+#define _VSERVER_DEVICE_DEF_H
@@ -11044,9 +11044,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/device_def.h linux-3.1
+};
+
+#endif /* _VSERVER_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit.h
---- linux-3.10.19/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/dlimit.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit.h
+--- linux-3.10.21/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,54 @@
+#ifndef _VSERVER_DLIMIT_H
+#define _VSERVER_DLIMIT_H
@@ -11102,9 +11102,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit.h linux-3.10.19
+#else /* _VSERVER_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_DLIMIT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
---- linux-3.10.19/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/dlimit_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h
+--- linux-3.10.21/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,46 @@
+#ifndef _VSERVER_DLIMIT_CMD_H
+#define _VSERVER_DLIMIT_CMD_H
@@ -11152,9 +11152,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/dlimit_cmd.h linux-3.1
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/global.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/global.h
---- linux-3.10.19/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/global.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/global.h
+--- linux-3.10.21/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/global.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_GLOBAL_H
+#define _VSERVER_GLOBAL_H
@@ -11175,9 +11175,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/global.h linux-3.10.19
+
+
+#endif /* _VSERVER_GLOBAL_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/history.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/history.h
---- linux-3.10.19/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/history.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/history.h
+--- linux-3.10.21/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/history.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,197 @@
+#ifndef _VSERVER_HISTORY_H
+#define _VSERVER_HISTORY_H
@@ -11376,9 +11376,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/history.h linux-3.10.1
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VSERVER_HISTORY_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode.h
---- linux-3.10.19/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/inode.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode.h
+--- linux-3.10.21/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,19 @@
+#ifndef _VSERVER_INODE_H
+#define _VSERVER_INODE_H
@@ -11399,9 +11399,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode.h linux-3.10.19-
+#else /* _VSERVER_INODE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_INODE_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode_cmd.h
---- linux-3.10.19/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/inode_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode_cmd.h
+--- linux-3.10.21/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,36 @@
+#ifndef _VSERVER_INODE_CMD_H
+#define _VSERVER_INODE_CMD_H
@@ -11439,9 +11439,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/inode_cmd.h linux-3.10
+#endif /* CONFIG_COMPAT */
+
+#endif /* _VSERVER_INODE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit.h
---- linux-3.10.19/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit.h
+--- linux-3.10.21/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,61 @@
+#ifndef _VSERVER_LIMIT_H
+#define _VSERVER_LIMIT_H
@@ -11504,9 +11504,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit.h linux-3.10.19-
+#define NUM_LIMITS 24
+
+#endif /* _VSERVER_LIMIT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_cmd.h
---- linux-3.10.19/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_cmd.h
+--- linux-3.10.21/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,35 @@
+#ifndef _VSERVER_LIMIT_CMD_H
+#define _VSERVER_LIMIT_CMD_H
@@ -11543,9 +11543,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_cmd.h linux-3.10
+#endif /* CONFIG_IA32_EMULATION */
+
+#endif /* _VSERVER_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_def.h
---- linux-3.10.19/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_def.h
+--- linux-3.10.21/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,47 @@
+#ifndef _VSERVER_LIMIT_DEF_H
+#define _VSERVER_LIMIT_DEF_H
@@ -11594,9 +11594,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_int.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_int.h
---- linux-3.10.19/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/limit_int.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_int.h
+--- linux-3.10.21/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/limit_int.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,193 @@
+#ifndef _VSERVER_LIMIT_INT_H
+#define _VSERVER_LIMIT_INT_H
@@ -11791,9 +11791,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/limit_int.h linux-3.10
+
+
+#endif /* _VSERVER_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/monitor.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/monitor.h
---- linux-3.10.19/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/monitor.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/monitor.h
+--- linux-3.10.21/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,6 @@
+#ifndef _VSERVER_MONITOR_H
+#define _VSERVER_MONITOR_H
@@ -11801,9 +11801,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/monitor.h linux-3.10.1
+#include <uapi/vserver/monitor.h>
+
+#endif /* _VSERVER_MONITOR_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/network.h
---- linux-3.10.19/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/network.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/network.h
+--- linux-3.10.21/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _VSERVER_NETWORK_H
+#define _VSERVER_NETWORK_H
@@ -11881,9 +11881,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network.h linux-3.10.1
+#endif
+
+#endif /* _VSERVER_NETWORK_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/network_cmd.h
---- linux-3.10.19/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/network_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/network_cmd.h
+--- linux-3.10.21/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,37 @@
+#ifndef _VSERVER_NETWORK_CMD_H
+#define _VSERVER_NETWORK_CMD_H
@@ -11922,9 +11922,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/network_cmd.h linux-3.
+extern int vc_set_ncaps(struct nx_info *, void __user *);
+
+#endif /* _VSERVER_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/percpu.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/percpu.h
---- linux-3.10.19/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/percpu.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/percpu.h
+--- linux-3.10.21/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/percpu.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_PERCPU_H
+#define _VSERVER_PERCPU_H
@@ -11940,9 +11940,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/percpu.h linux-3.10.19
+#define PERCPU_PERCTX (sizeof(struct _vx_percpu))
+
+#endif /* _VSERVER_PERCPU_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/pid.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/pid.h
---- linux-3.10.19/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/pid.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/pid.h
+--- linux-3.10.21/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/pid.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,51 @@
+#ifndef _VSERVER_PID_H
+#define _VSERVER_PID_H
@@ -11995,9 +11995,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/pid.h linux-3.10.19-vs
+}
+
+#endif
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched.h
---- linux-3.10.19/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched.h
+--- linux-3.10.21/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _VSERVER_SCHED_H
+#define _VSERVER_SCHED_H
@@ -12022,9 +12022,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched.h linux-3.10.19-
+#else /* _VSERVER_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SCHED_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_cmd.h
---- linux-3.10.19/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_cmd.h
+--- linux-3.10.21/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,11 @@
+#ifndef _VSERVER_SCHED_CMD_H
+#define _VSERVER_SCHED_CMD_H
@@ -12037,9 +12037,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_cmd.h linux-3.10
+extern int vc_get_prio_bias(struct vx_info *, void __user *);
+
+#endif /* _VSERVER_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_def.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_def.h
---- linux-3.10.19/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/sched_def.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_def.h
+--- linux-3.10.21/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/sched_def.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,38 @@
+#ifndef _VSERVER_SCHED_DEF_H
+#define _VSERVER_SCHED_DEF_H
@@ -12079,9 +12079,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/sched_def.h linux-3.10
+#endif
+
+#endif /* _VSERVER_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal.h
---- linux-3.10.19/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/signal.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal.h
+--- linux-3.10.21/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_H
+#define _VSERVER_SIGNAL_H
@@ -12097,9 +12097,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal.h linux-3.10.19
+#else /* _VSERVER_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SIGNAL_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal_cmd.h
---- linux-3.10.19/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/signal_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal_cmd.h
+--- linux-3.10.21/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _VSERVER_SIGNAL_CMD_H
+#define _VSERVER_SIGNAL_CMD_H
@@ -12115,9 +12115,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/signal_cmd.h linux-3.1
+extern int vc_set_pflags(uint32_t pid, void __user *);
+
+#endif /* _VSERVER_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/space.h
---- linux-3.10.19/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/space.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/space.h
+--- linux-3.10.21/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/space.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _VSERVER_SPACE_H
+#define _VSERVER_SPACE_H
@@ -12131,9 +12131,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space.h linux-3.10.19-
+#else /* _VSERVER_SPACE_H */
+#warning duplicate inclusion
+#endif /* _VSERVER_SPACE_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/space_cmd.h
---- linux-3.10.19/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/space_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/space_cmd.h
+--- linux-3.10.21/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _VSERVER_SPACE_CMD_H
+#define _VSERVER_SPACE_CMD_H
@@ -12148,9 +12148,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/space_cmd.h linux-3.10
+extern int vc_get_space_mask(void __user *, int);
+
+#endif /* _VSERVER_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/switch.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/switch.h
---- linux-3.10.19/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/switch.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/switch.h
+--- linux-3.10.21/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef _VSERVER_SWITCH_H
+#define _VSERVER_SWITCH_H
@@ -12160,9 +12160,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/switch.h linux-3.10.19
+#include <uapi/vserver/switch.h>
+
+#endif /* _VSERVER_SWITCH_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag.h
---- linux-3.10.19/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/tag.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag.h
+--- linux-3.10.21/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,160 @@
+#ifndef _DX_TAG_H
+#define _DX_TAG_H
@@ -12324,9 +12324,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag.h linux-3.10.19-vs
+#endif
+
+#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag_cmd.h linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag_cmd.h
---- linux-3.10.19/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/linux/vserver/tag_cmd.h linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag_cmd.h
+--- linux-3.10.21/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/linux/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,10 @@
+#ifndef _VSERVER_TAG_CMD_H
+#define _VSERVER_TAG_CMD_H
@@ -12338,9 +12338,9 @@ diff -NurpP --minimal linux-3.10.19/include/linux/vserver/tag_cmd.h linux-3.10.1
+extern int vc_tag_migrate(uint32_t);
+
+#endif /* _VSERVER_TAG_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/net/addrconf.h linux-3.10.19-vs2.3.6.8/include/net/addrconf.h
---- linux-3.10.19/include/net/addrconf.h 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/addrconf.h linux-3.10.21-vs2.3.6.8/include/net/addrconf.h
+--- linux-3.10.21/include/net/addrconf.h 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/addrconf.h 2013-11-13 17:19:37.000000000 +0000
@@ -89,7 +89,8 @@ extern int ipv6_dev_get_saddr(struct n
const struct net_device *dev,
const struct in6_addr *daddr,
@@ -12351,9 +12351,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/addrconf.h linux-3.10.19-vs2.3.6
extern int __ipv6_get_lladdr(struct inet6_dev *idev,
struct in6_addr *addr,
unsigned char banned_flags);
-diff -NurpP --minimal linux-3.10.19/include/net/af_unix.h linux-3.10.19-vs2.3.6.8/include/net/af_unix.h
---- linux-3.10.19/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/af_unix.h linux-3.10.21-vs2.3.6.8/include/net/af_unix.h
+--- linux-3.10.21/include/net/af_unix.h 2013-07-14 17:01:33.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/af_unix.h 2013-08-22 20:30:00.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/socket.h>
#include <linux/un.h>
@@ -12362,9 +12362,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/af_unix.h linux-3.10.19-vs2.3.6.
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.10.19/include/net/inet_timewait_sock.h linux-3.10.19-vs2.3.6.8/include/net/inet_timewait_sock.h
---- linux-3.10.19/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/inet_timewait_sock.h linux-3.10.21-vs2.3.6.8/include/net/inet_timewait_sock.h
+--- linux-3.10.21/include/net/inet_timewait_sock.h 2013-05-31 13:45:28.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/inet_timewait_sock.h 2013-08-22 20:30:00.000000000 +0000
@@ -116,6 +116,10 @@ struct inet_timewait_sock {
#define tw_dport __tw_common.skc_dport
#define tw_num __tw_common.skc_num
@@ -12376,9 +12376,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/inet_timewait_sock.h linux-3.10.
int tw_timeout;
volatile unsigned char tw_substate;
-diff -NurpP --minimal linux-3.10.19/include/net/ip6_route.h linux-3.10.19-vs2.3.6.8/include/net/ip6_route.h
---- linux-3.10.19/include/net/ip6_route.h 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/ip6_route.h linux-3.10.21-vs2.3.6.8/include/net/ip6_route.h
+--- linux-3.10.21/include/net/ip6_route.h 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/ip6_route.h 2013-11-13 17:22:25.000000000 +0000
@@ -95,7 +95,8 @@ extern int ip6_route_get_saddr(struct
struct rt6_info *rt,
const struct in6_addr *daddr,
@@ -12389,9 +12389,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/ip6_route.h linux-3.10.19-vs2.3.
extern struct rt6_info *rt6_lookup(struct net *net,
const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.10.19/include/net/route.h linux-3.10.19-vs2.3.6.8/include/net/route.h
---- linux-3.10.19/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/route.h linux-3.10.21-vs2.3.6.8/include/net/route.h
+--- linux-3.10.21/include/net/route.h 2013-02-19 13:58:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/route.h 2013-08-22 20:30:00.000000000 +0000
@@ -207,6 +207,9 @@ static inline void ip_rt_put(struct rtab
dst_release(&rt->dst);
}
@@ -12439,9 +12439,9 @@ diff -NurpP --minimal linux-3.10.19/include/net/route.h linux-3.10.19-vs2.3.6.8/
rt = __ip_route_output_key(net, fl4);
if (IS_ERR(rt))
return rt;
-diff -NurpP --minimal linux-3.10.19/include/net/sock.h linux-3.10.19-vs2.3.6.8/include/net/sock.h
---- linux-3.10.19/include/net/sock.h 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/net/sock.h linux-3.10.21-vs2.3.6.8/include/net/sock.h
+--- linux-3.10.21/include/net/sock.h 2013-11-30 07:50:50.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/net/sock.h 2013-11-13 17:22:25.000000000 +0000
@@ -191,6 +191,10 @@ struct sock_common {
#ifdef CONFIG_NET_NS
struct net *skc_net;
@@ -12464,17 +12464,17 @@ diff -NurpP --minimal linux-3.10.19/include/net/sock.h linux-3.10.19-vs2.3.6.8/i
socket_lock_t sk_lock;
struct sk_buff_head sk_receive_queue;
/*
-diff -NurpP --minimal linux-3.10.19/include/uapi/Kbuild linux-3.10.19-vs2.3.6.8/include/uapi/Kbuild
---- linux-3.10.19/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/Kbuild linux-3.10.21-vs2.3.6.8/include/uapi/Kbuild
+--- linux-3.10.21/include/uapi/Kbuild 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/Kbuild 2013-08-22 20:30:00.000000000 +0000
@@ -12,3 +12,4 @@ header-y += video/
header-y += drm/
header-y += xen/
header-y += scsi/
+header-y += vserver/
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/capability.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/capability.h
---- linux-3.10.19/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/capability.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/capability.h
+--- linux-3.10.21/include/uapi/linux/capability.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/capability.h 2013-08-22 20:30:00.000000000 +0000
@@ -259,6 +259,7 @@ struct vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -12497,9 +12497,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/capability.h linux-3.10.1
/*
* Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/fs.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/fs.h
---- linux-3.10.19/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/fs.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/fs.h
+--- linux-3.10.21/include/uapi/linux/fs.h 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/fs.h 2013-08-22 20:30:00.000000000 +0000
@@ -86,6 +86,9 @@ struct inodes_stat_t {
#define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */
#define MS_I_VERSION (1<<23) /* Update inode I_version field */
@@ -12527,9 +12527,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/fs.h linux-3.10.19-vs2.3.
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
#define SYNC_FILE_RANGE_WRITE 2
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/gfs2_ondisk.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
---- linux-3.10.19/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/gfs2_ondisk.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h
+--- linux-3.10.21/include/uapi/linux/gfs2_ondisk.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/gfs2_ondisk.h 2013-08-22 20:30:00.000000000 +0000
@@ -225,6 +225,9 @@ enum {
gfs2fl_Sync = 8,
gfs2fl_System = 9,
@@ -12550,9 +12550,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/gfs2_ondisk.h linux-3.10.
#define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */
#define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */
#define GFS2_DIF_INHERIT_JDATA 0x80000000
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/if_tun.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/if_tun.h
---- linux-3.10.19/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/if_tun.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/if_tun.h
+--- linux-3.10.21/include/uapi/linux/if_tun.h 2013-02-19 13:58:55.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/if_tun.h 2013-08-22 20:30:00.000000000 +0000
@@ -56,6 +56,7 @@
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
#define TUNSETVNETHDRSZ _IOW('T', 216, int)
@@ -12561,9 +12561,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/if_tun.h linux-3.10.19-vs
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/major.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/major.h
---- linux-3.10.19/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/major.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/major.h
+--- linux-3.10.21/include/uapi/linux/major.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/major.h 2013-08-22 20:30:00.000000000 +0000
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -12572,9 +12572,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/major.h linux-3.10.19-vs2
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/nfs_mount.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/nfs_mount.h
---- linux-3.10.19/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/nfs_mount.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/nfs_mount.h
+--- linux-3.10.21/include/uapi/linux/nfs_mount.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/nfs_mount.h 2013-08-22 20:30:00.000000000 +0000
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -12585,9 +12585,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/nfs_mount.h linux-3.10.19
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/reboot.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/reboot.h
---- linux-3.10.19/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/reboot.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/reboot.h
+--- linux-3.10.21/include/uapi/linux/reboot.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/reboot.h 2013-08-22 20:30:00.000000000 +0000
@@ -33,7 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -12597,9 +12597,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/reboot.h linux-3.10.19-vs
#endif /* _UAPI_LINUX_REBOOT_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/linux/sysctl.h linux-3.10.19-vs2.3.6.8/include/uapi/linux/sysctl.h
---- linux-3.10.19/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/linux/sysctl.h linux-3.10.21-vs2.3.6.8/include/uapi/linux/sysctl.h
+--- linux-3.10.21/include/uapi/linux/sysctl.h 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/linux/sysctl.h 2013-08-22 20:30:00.000000000 +0000
@@ -60,6 +60,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -12616,9 +12616,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/linux/sysctl.h linux-3.10.19-vs
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/Kbuild linux-3.10.19-vs2.3.6.8/include/uapi/vserver/Kbuild
---- linux-3.10.19/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/Kbuild linux-3.10.21-vs2.3.6.8/include/uapi/vserver/Kbuild
+--- linux-3.10.21/include/uapi/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/Kbuild 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,9 @@
+
+header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12629,9 +12629,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/Kbuild linux-3.10.19-vs
+header-y += switch.h context.h network.h monitor.h \
+ limit.h inode.h device.h
+
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cacct_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
---- linux-3.10.19/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/cacct_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h
+--- linux-3.10.21/include/uapi/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cacct_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,15 @@
+#ifndef _UAPI_VS_CACCT_CMD_H
+#define _UAPI_VS_CACCT_CMD_H
@@ -12648,9 +12648,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cacct_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context.h
---- linux-3.10.19/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/context.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context.h
+--- linux-3.10.21/include/uapi/vserver/context.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context.h 2013-10-27 03:43:35.000000000 +0000
@@ -0,0 +1,81 @@
+#ifndef _UAPI_VS_CONTEXT_H
+#define _UAPI_VS_CONTEXT_H
@@ -12733,9 +12733,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context.h linux-3.10.19
+#define VXC_NAMESPACE 0x02000000
+
+#endif /* _UAPI_VS_CONTEXT_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context_cmd.h
---- linux-3.10.19/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/context_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context_cmd.h
+--- linux-3.10.21/include/uapi/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/context_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,115 @@
+#ifndef _UAPI_VS_CONTEXT_CMD_H
+#define _UAPI_VS_CONTEXT_CMD_H
@@ -12852,9 +12852,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/context_cmd.h linux-3.1
+};
+
+#endif /* _UAPI_VS_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cvirt_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
---- linux-3.10.19/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/cvirt_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h
+--- linux-3.10.21/include/uapi/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/cvirt_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,41 @@
+#ifndef _UAPI_VS_CVIRT_CMD_H
+#define _UAPI_VS_CVIRT_CMD_H
@@ -12897,9 +12897,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/cvirt_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/debug_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
---- linux-3.10.19/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/debug_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/debug_cmd.h
+--- linux-3.10.21/include/uapi/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/debug_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,24 @@
+#ifndef _UAPI_VS_DEBUG_CMD_H
+#define _UAPI_VS_DEBUG_CMD_H
@@ -12925,9 +12925,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/debug_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device.h
---- linux-3.10.19/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/device.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device.h
+--- linux-3.10.21/include/uapi/vserver/device.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,12 @@
+#ifndef _UAPI_VS_DEVICE_H
+#define _UAPI_VS_DEVICE_H
@@ -12941,9 +12941,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device.h linux-3.10.19-
+#define DATTR_MASK 0x00000013
+
+#endif /* _UAPI_VS_DEVICE_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device_cmd.h
---- linux-3.10.19/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/device_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device_cmd.h
+--- linux-3.10.21/include/uapi/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/device_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef _UAPI_VS_DEVICE_CMD_H
+#define _UAPI_VS_DEVICE_CMD_H
@@ -12961,9 +12961,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/device_cmd.h linux-3.10
+};
+
+#endif /* _UAPI_VS_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/dlimit_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
---- linux-3.10.19/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/dlimit_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h
+--- linux-3.10.21/include/uapi/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/dlimit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _UAPI_VS_DLIMIT_CMD_H
+#define _UAPI_VS_DLIMIT_CMD_H
@@ -13032,9 +13032,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/dlimit_cmd.h linux-3.10
+}
+
+#endif /* _UAPI_VS_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode.h
---- linux-3.10.19/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/inode.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode.h
+--- linux-3.10.21/include/uapi/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,23 @@
+#ifndef _UAPI_VS_INODE_H
+#define _UAPI_VS_INODE_H
@@ -13059,9 +13059,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode.h linux-3.10.19-v
+#define FIOC_SETXFLG _IOW('x', 6, long)
+
+#endif /* _UAPI_VS_INODE_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
---- linux-3.10.19/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/inode_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode_cmd.h
+--- linux-3.10.21/include/uapi/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/inode_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,26 @@
+#ifndef _UAPI_VS_INODE_CMD_H
+#define _UAPI_VS_INODE_CMD_H
@@ -13089,9 +13089,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/inode_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_INODE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit.h
---- linux-3.10.19/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/limit.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit.h
+--- linux-3.10.21/include/uapi/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_LIMIT_H
+#define _UAPI_VS_LIMIT_H
@@ -13107,9 +13107,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit.h linux-3.10.19-v
+#define VLIMIT_MAPPED 23
+
+#endif /* _UAPI_VS_LIMIT_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
---- linux-3.10.19/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/limit_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit_cmd.h
+--- linux-3.10.21/include/uapi/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/limit_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,40 @@
+#ifndef _UAPI_VS_LIMIT_CMD_H
+#define _UAPI_VS_LIMIT_CMD_H
@@ -13151,9 +13151,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/limit_cmd.h linux-3.10.
+#define CRLIM_KEEP (~1ULL)
+
+#endif /* _UAPI_VS_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/monitor.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/monitor.h
---- linux-3.10.19/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/monitor.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/monitor.h
+--- linux-3.10.21/include/uapi/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/monitor.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,96 @@
+#ifndef _UAPI_VS_MONITOR_H
+#define _UAPI_VS_MONITOR_H
@@ -13251,9 +13251,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/monitor.h linux-3.10.19
+};
+
+#endif /* _UAPI_VS_MONITOR_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network.h
---- linux-3.10.19/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/network.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network.h
+--- linux-3.10.21/include/uapi/vserver/network.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,76 @@
+#ifndef _UAPI_VS_NETWORK_H
+#define _UAPI_VS_NETWORK_H
@@ -13331,9 +13331,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network.h linux-3.10.19
+#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
+
+#endif /* _UAPI_VS_NETWORK_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network_cmd.h
---- linux-3.10.19/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/network_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network_cmd.h
+--- linux-3.10.21/include/uapi/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/network_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _UAPI_VS_NETWORK_CMD_H
+#define _UAPI_VS_NETWORK_CMD_H
@@ -13458,9 +13458,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/network_cmd.h linux-3.1
+};
+
+#endif /* _UAPI_VS_NETWORK_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/sched_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
---- linux-3.10.19/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/sched_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/sched_cmd.h
+--- linux-3.10.21/include/uapi/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/sched_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,13 @@
+#ifndef _UAPI_VS_SCHED_CMD_H
+#define _UAPI_VS_SCHED_CMD_H
@@ -13475,9 +13475,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/sched_cmd.h linux-3.10.
+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0)
+
+#endif /* _UAPI_VS_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/signal_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
---- linux-3.10.19/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/signal_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/signal_cmd.h
+--- linux-3.10.21/include/uapi/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/signal_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+#ifndef _UAPI_VS_SIGNAL_CMD_H
+#define _UAPI_VS_SIGNAL_CMD_H
@@ -13510,9 +13510,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/signal_cmd.h linux-3.10
+};
+
+#endif /* _UAPI_VS_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/space_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/space_cmd.h
---- linux-3.10.19/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/space_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/space_cmd.h
+--- linux-3.10.21/include/uapi/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/space_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,28 @@
+#ifndef _UAPI_VS_SPACE_CMD_H
+#define _UAPI_VS_SPACE_CMD_H
@@ -13542,9 +13542,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/space_cmd.h linux-3.10.
+};
+
+#endif /* _UAPI_VS_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/switch.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/switch.h
---- linux-3.10.19/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/switch.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/switch.h
+--- linux-3.10.21/include/uapi/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/switch.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,90 @@
+#ifndef _UAPI_VS_SWITCH_H
+#define _UAPI_VS_SWITCH_H
@@ -13636,9 +13636,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/switch.h linux-3.10.19-
+#define VCMD_get_vci VC_CMD(VERSION, 1, 0)
+
+#endif /* _UAPI_VS_SWITCH_H */
-diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/tag_cmd.h linux-3.10.19-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
---- linux-3.10.19/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/include/uapi/vserver/tag_cmd.h linux-3.10.21-vs2.3.6.8/include/uapi/vserver/tag_cmd.h
+--- linux-3.10.21/include/uapi/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/include/uapi/vserver/tag_cmd.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,14 @@
+#ifndef _UAPI_VS_TAG_CMD_H
+#define _UAPI_VS_TAG_CMD_H
@@ -13654,9 +13654,9 @@ diff -NurpP --minimal linux-3.10.19/include/uapi/vserver/tag_cmd.h linux-3.10.19
+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0)
+
+#endif /* _UAPI_VS_TAG_CMD_H */
-diff -NurpP --minimal linux-3.10.19/init/Kconfig linux-3.10.19-vs2.3.6.8/init/Kconfig
---- linux-3.10.19/init/Kconfig 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/init/Kconfig linux-3.10.21-vs2.3.6.8/init/Kconfig
+--- linux-3.10.21/init/Kconfig 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/init/Kconfig 2013-08-22 20:30:00.000000000 +0000
@@ -805,6 +805,7 @@ config NUMA_BALANCING
menuconfig CGROUPS
boolean "Control Group support"
@@ -13673,9 +13673,9 @@ diff -NurpP --minimal linux-3.10.19/init/Kconfig linux-3.10.19-vs2.3.6.8/init/Kc
select UIDGID_STRICT_TYPE_CHECKS
default n
-diff -NurpP --minimal linux-3.10.19/init/main.c linux-3.10.19-vs2.3.6.8/init/main.c
---- linux-3.10.19/init/main.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/init/main.c linux-3.10.21-vs2.3.6.8/init/main.c
+--- linux-3.10.21/init/main.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/init/main.c 2013-11-13 17:19:37.000000000 +0000
@@ -75,6 +75,7 @@
#include <linux/blkdev.h>
#include <linux/elevator.h>
@@ -13684,9 +13684,9 @@ diff -NurpP --minimal linux-3.10.19/init/main.c linux-3.10.19-vs2.3.6.8/init/mai
#include <asm/io.h>
#include <asm/bugs.h>
-diff -NurpP --minimal linux-3.10.19/ipc/mqueue.c linux-3.10.19-vs2.3.6.8/ipc/mqueue.c
---- linux-3.10.19/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/ipc/mqueue.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/ipc/mqueue.c linux-3.10.21-vs2.3.6.8/ipc/mqueue.c
+--- linux-3.10.21/ipc/mqueue.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/ipc/mqueue.c 2013-08-22 20:30:00.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/ipc_namespace.h>
#include <linux/user_namespace.h>
@@ -13762,9 +13762,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/mqueue.c linux-3.10.19-vs2.3.6.8/ipc/mqu
free_uid(user);
}
if (ipc_ns)
-diff -NurpP --minimal linux-3.10.19/ipc/msg.c linux-3.10.19-vs2.3.6.8/ipc/msg.c
---- linux-3.10.19/ipc/msg.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/ipc/msg.c linux-3.10.21-vs2.3.6.8/ipc/msg.c
+--- linux-3.10.21/ipc/msg.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/ipc/msg.c 2013-11-13 17:17:16.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13781,9 +13781,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/msg.c linux-3.10.19-vs2.3.6.8/ipc/msg.c
msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.10.19/ipc/sem.c linux-3.10.19-vs2.3.6.8/ipc/sem.c
---- linux-3.10.19/ipc/sem.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/ipc/sem.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/ipc/sem.c linux-3.10.21-vs2.3.6.8/ipc/sem.c
+--- linux-3.10.21/ipc/sem.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/ipc/sem.c 2013-11-13 17:19:37.000000000 +0000
@@ -86,6 +86,8 @@
#include <linux/rwsem.h>
#include <linux/nsproxy.h>
@@ -13821,9 +13821,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/sem.c linux-3.10.19-vs2.3.6.8/ipc/sem.c
ipc_rcu_putref(sma, sem_rcu_free);
}
-diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
---- linux-3.10.19/ipc/shm.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/ipc/shm.c 2013-11-13 17:19:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/ipc/shm.c linux-3.10.21-vs2.3.6.8/ipc/shm.c
+--- linux-3.10.21/ipc/shm.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/ipc/shm.c 2013-11-30 07:55:52.000000000 +0000
@@ -42,6 +42,8 @@
#include <linux/nsproxy.h>
#include <linux/mount.h>
@@ -13833,29 +13833,31 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
#include <asm/uaccess.h>
-@@ -208,7 +210,12 @@ static void shm_open(struct vm_area_stru
- */
+@@ -209,10 +211,14 @@ static void shm_open(struct vm_area_stru
static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp)
{
-- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ struct file *shm_file;
+ struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid);
+ int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
-+
+
+ shm_file = shp->shm_file;
+ shp->shm_file = NULL;
+- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ vx_ipcshm_sub(vxi, shp, numpages);
+ ns->shm_tot -= numpages;
+
shm_rmid(ns, shp);
shm_unlock(shp);
- if (!is_file_hugepages(shp->shm_file))
-@@ -217,6 +224,7 @@ static void shm_destroy(struct ipc_names
- user_shm_unlock(file_inode(shp->shm_file)->i_size,
- shp->mlock_user);
- fput (shp->shm_file);
+ if (!is_file_hugepages(shm_file))
+@@ -220,6 +226,7 @@ static void shm_destroy(struct ipc_names
+ else if (shp->mlock_user)
+ user_shm_unlock(file_inode(shm_file)->i_size, shp->mlock_user);
+ fput(shm_file);
+ put_vx_info(vxi);
ipc_rcu_putref(shp, shm_rcu_free);
}
-@@ -494,11 +502,15 @@ static int newseg(struct ipc_namespace *
+@@ -497,11 +504,15 @@ static int newseg(struct ipc_namespace *
if (ns->shm_tot + numpages > ns->shm_ctlall)
return -ENOSPC;
@@ -13871,7 +13873,7 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
shp->shm_perm.mode = (shmflg & S_IRWXUGO);
shp->mlock_user = NULL;
-@@ -567,6 +579,7 @@ static int newseg(struct ipc_namespace *
+@@ -570,6 +581,7 @@ static int newseg(struct ipc_namespace *
ipc_unlock_object(&shp->shm_perm);
rcu_read_unlock();
@@ -13879,9 +13881,9 @@ diff -NurpP --minimal linux-3.10.19/ipc/shm.c linux-3.10.19-vs2.3.6.8/ipc/shm.c
return error;
no_id:
-diff -NurpP --minimal linux-3.10.19/kernel/Makefile linux-3.10.19-vs2.3.6.8/kernel/Makefile
---- linux-3.10.19/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/Makefile linux-3.10.21-vs2.3.6.8/kernel/Makefile
+--- linux-3.10.21/kernel/Makefile 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/Makefile 2013-08-22 21:18:32.000000000 +0000
@@ -25,6 +25,7 @@ endif
obj-y += sched/
obj-y += power/
@@ -13890,9 +13892,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/Makefile linux-3.10.19-vs2.3.6.8/kern
obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o
obj-$(CONFIG_FREEZER) += freezer.o
-diff -NurpP --minimal linux-3.10.19/kernel/auditsc.c linux-3.10.19-vs2.3.6.8/kernel/auditsc.c
---- linux-3.10.19/kernel/auditsc.c 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/auditsc.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/auditsc.c linux-3.10.21-vs2.3.6.8/kernel/auditsc.c
+--- linux-3.10.21/kernel/auditsc.c 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/auditsc.c 2013-08-22 20:30:00.000000000 +0000
@@ -1976,7 +1976,7 @@ int audit_set_loginuid(kuid_t loginuid)
if (audit_loginuid_set(task))
return -EPERM;
@@ -13902,9 +13904,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/auditsc.c linux-3.10.19-vs2.3.6.8/ker
return -EPERM;
#endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
-diff -NurpP --minimal linux-3.10.19/kernel/capability.c linux-3.10.19-vs2.3.6.8/kernel/capability.c
---- linux-3.10.19/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/capability.c linux-3.10.21-vs2.3.6.8/kernel/capability.c
+--- linux-3.10.21/kernel/capability.c 2013-05-31 13:45:29.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/capability.c 2013-08-22 20:30:00.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/syscalls.h>
#include <linux/pid_namespace.h>
@@ -13930,9 +13932,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/capability.c linux-3.10.19-vs2.3.6.8/
/**
* has_capability_noaudit - Does a task have a capability (unaudited) in the
* initial user ns
-diff -NurpP --minimal linux-3.10.19/kernel/compat.c linux-3.10.19-vs2.3.6.8/kernel/compat.c
---- linux-3.10.19/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/compat.c linux-3.10.21-vs2.3.6.8/kernel/compat.c
+--- linux-3.10.21/kernel/compat.c 2013-07-14 17:01:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/compat.c 2013-08-22 20:30:00.000000000 +0000
@@ -27,6 +27,7 @@
#include <linux/times.h>
#include <linux/ptrace.h>
@@ -13950,9 +13952,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/compat.c linux-3.10.19-vs2.3.6.8/kern
return 0;
}
-diff -NurpP --minimal linux-3.10.19/kernel/cred.c linux-3.10.19-vs2.3.6.8/kernel/cred.c
---- linux-3.10.19/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/cred.c linux-3.10.21-vs2.3.6.8/kernel/cred.c
+--- linux-3.10.21/kernel/cred.c 2013-02-19 13:58:56.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/cred.c 2013-08-22 20:30:00.000000000 +0000
@@ -56,31 +56,6 @@ struct cred init_cred = {
.group_info = &init_groups,
};
@@ -14022,9 +14024,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/cred.c linux-3.10.19-vs2.3.6.8/kernel
EXPORT_SYMBOL(prepare_creds);
/*
-diff -NurpP --minimal linux-3.10.19/kernel/exit.c linux-3.10.19-vs2.3.6.8/kernel/exit.c
---- linux-3.10.19/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/exit.c linux-3.10.21-vs2.3.6.8/kernel/exit.c
+--- linux-3.10.21/kernel/exit.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/exit.c 2013-08-22 20:30:00.000000000 +0000
@@ -48,6 +48,10 @@
#include <linux/fs_struct.h>
#include <linux/init_task.h>
@@ -14120,9 +14122,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/exit.c linux-3.10.19-vs2.3.6.8/kernel
BUG();
/* Avoid "noreturn function does return". */
for (;;)
-diff -NurpP --minimal linux-3.10.19/kernel/fork.c linux-3.10.19-vs2.3.6.8/kernel/fork.c
---- linux-3.10.19/kernel/fork.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/fork.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/fork.c linux-3.10.21-vs2.3.6.8/kernel/fork.c
+--- linux-3.10.21/kernel/fork.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/fork.c 2013-11-13 17:17:16.000000000 +0000
@@ -71,6 +71,9 @@
#include <linux/signalfd.h>
#include <linux/uprobes.h>
@@ -14215,9 +14217,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/fork.c linux-3.10.19-vs2.3.6.8/kernel
write_unlock_irq(&tasklist_lock);
proc_fork_connector(p);
cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.10.19/kernel/kthread.c linux-3.10.19-vs2.3.6.8/kernel/kthread.c
---- linux-3.10.19/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/kthread.c linux-3.10.21-vs2.3.6.8/kernel/kthread.c
+--- linux-3.10.21/kernel/kthread.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/kthread.c 2013-08-22 21:14:28.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/freezer.h>
#include <linux/ptrace.h>
@@ -14226,9 +14228,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/kthread.c linux-3.10.19-vs2.3.6.8/ker
#include <trace/events/sched.h>
static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.10.19/kernel/nsproxy.c linux-3.10.19-vs2.3.6.8/kernel/nsproxy.c
---- linux-3.10.19/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/nsproxy.c linux-3.10.21-vs2.3.6.8/kernel/nsproxy.c
+--- linux-3.10.21/kernel/nsproxy.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/nsproxy.c 2013-08-22 21:09:55.000000000 +0000
@@ -20,11 +20,14 @@
#include <linux/mnt_namespace.h>
#include <linux/utsname.h>
@@ -14414,9 +14416,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/nsproxy.c linux-3.10.19-vs2.3.6.8/ker
return -EPERM;
*new_nsp = create_new_namespaces(unshare_flags, current, user_ns,
-diff -NurpP --minimal linux-3.10.19/kernel/pid.c linux-3.10.19-vs2.3.6.8/kernel/pid.c
---- linux-3.10.19/kernel/pid.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/pid.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/pid.c linux-3.10.21-vs2.3.6.8/kernel/pid.c
+--- linux-3.10.21/kernel/pid.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/pid.c 2013-11-13 17:17:16.000000000 +0000
@@ -38,6 +38,7 @@
#include <linux/syscalls.h>
#include <linux/proc_ns.h>
@@ -14474,9 +14476,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/pid.c linux-3.10.19-vs2.3.6.8/kernel/
pid_t pid_vnr(struct pid *pid)
{
return pid_nr_ns(pid, task_active_pid_ns(current));
-diff -NurpP --minimal linux-3.10.19/kernel/pid_namespace.c linux-3.10.19-vs2.3.6.8/kernel/pid_namespace.c
---- linux-3.10.19/kernel/pid_namespace.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/pid_namespace.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/pid_namespace.c linux-3.10.21-vs2.3.6.8/kernel/pid_namespace.c
+--- linux-3.10.21/kernel/pid_namespace.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/pid_namespace.c 2013-08-22 20:30:00.000000000 +0000
@@ -18,6 +18,7 @@
#include <linux/proc_ns.h>
#include <linux/reboot.h>
@@ -14501,9 +14503,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/pid_namespace.c linux-3.10.19-vs2.3.6
kmem_cache_free(pid_ns_cachep, ns);
}
-diff -NurpP --minimal linux-3.10.19/kernel/posix-timers.c linux-3.10.19-vs2.3.6.8/kernel/posix-timers.c
---- linux-3.10.19/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/posix-timers.c 2013-08-22 21:10:34.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/posix-timers.c linux-3.10.21-vs2.3.6.8/kernel/posix-timers.c
+--- linux-3.10.21/kernel/posix-timers.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/posix-timers.c 2013-08-22 21:10:34.000000000 +0000
@@ -48,6 +48,7 @@
#include <linux/workqueue.h>
#include <linux/export.h>
@@ -14539,9 +14541,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/posix-timers.c linux-3.10.19-vs2.3.6.
/* If we failed to send the signal the timer stops. */
return ret > 0;
}
-diff -NurpP --minimal linux-3.10.19/kernel/printk.c linux-3.10.19-vs2.3.6.8/kernel/printk.c
---- linux-3.10.19/kernel/printk.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/printk.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/printk.c linux-3.10.21-vs2.3.6.8/kernel/printk.c
+--- linux-3.10.21/kernel/printk.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/printk.c 2013-11-13 17:17:16.000000000 +0000
@@ -45,6 +45,7 @@
#include <linux/poll.h>
#include <linux/irq_work.h>
@@ -14609,9 +14611,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/printk.c linux-3.10.19-vs2.3.6.8/kern
error = syslog_print_all(buf, len, clear);
break;
/* Clear ring buffer */
-diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kernel/ptrace.c
---- linux-3.10.19/kernel/ptrace.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/ptrace.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/ptrace.c linux-3.10.21-vs2.3.6.8/kernel/ptrace.c
+--- linux-3.10.21/kernel/ptrace.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/ptrace.c 2013-11-30 07:53:00.000000000 +0000
@@ -23,6 +23,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
@@ -14620,7 +14622,7 @@ diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kern
#include <linux/hw_breakpoint.h>
#include <linux/cn_proc.h>
#include <linux/compat.h>
-@@ -263,6 +264,11 @@ ok:
+@@ -264,6 +265,11 @@ ok:
}
rcu_read_unlock();
@@ -14632,9 +14634,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/ptrace.c linux-3.10.19-vs2.3.6.8/kern
return security_ptrace_access_check(task, mode);
}
-diff -NurpP --minimal linux-3.10.19/kernel/sched/core.c linux-3.10.19-vs2.3.6.8/kernel/sched/core.c
---- linux-3.10.19/kernel/sched/core.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sched/core.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sched/core.c linux-3.10.21-vs2.3.6.8/kernel/sched/core.c
+--- linux-3.10.21/kernel/sched/core.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sched/core.c 2013-08-22 20:30:00.000000000 +0000
@@ -73,6 +73,8 @@
#include <linux/init_task.h>
#include <linux/binfmts.h>
@@ -14674,9 +14676,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/core.c linux-3.10.19-vs2.3.6.8/
retval = security_task_setnice(current, nice);
if (retval)
-diff -NurpP --minimal linux-3.10.19/kernel/sched/cputime.c linux-3.10.19-vs2.3.6.8/kernel/sched/cputime.c
---- linux-3.10.19/kernel/sched/cputime.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sched/cputime.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sched/cputime.c linux-3.10.21-vs2.3.6.8/kernel/sched/cputime.c
+--- linux-3.10.21/kernel/sched/cputime.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sched/cputime.c 2013-11-13 17:17:16.000000000 +0000
@@ -4,6 +4,7 @@
#include <linux/kernel_stat.h>
#include <linux/static_key.h>
@@ -14717,9 +14719,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/cputime.c linux-3.10.19-vs2.3.6
account_group_system_time(p, cputime);
/* Add system time to cpustat. */
-diff -NurpP --minimal linux-3.10.19/kernel/sched/fair.c linux-3.10.19-vs2.3.6.8/kernel/sched/fair.c
---- linux-3.10.19/kernel/sched/fair.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sched/fair.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sched/fair.c linux-3.10.21-vs2.3.6.8/kernel/sched/fair.c
+--- linux-3.10.21/kernel/sched/fair.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sched/fair.c 2013-11-13 17:17:16.000000000 +0000
@@ -29,6 +29,7 @@
#include <linux/mempolicy.h>
#include <linux/migrate.h>
@@ -14746,9 +14748,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sched/fair.c linux-3.10.19-vs2.3.6.8/
account_entity_dequeue(cfs_rq, se);
/*
-diff -NurpP --minimal linux-3.10.19/kernel/signal.c linux-3.10.19-vs2.3.6.8/kernel/signal.c
---- linux-3.10.19/kernel/signal.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/signal.c 2013-08-22 21:13:50.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/signal.c linux-3.10.21-vs2.3.6.8/kernel/signal.c
+--- linux-3.10.21/kernel/signal.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/signal.c 2013-08-22 21:13:50.000000000 +0000
@@ -33,6 +33,8 @@
#include <linux/uprobes.h>
#include <linux/compat.h>
@@ -14841,9 +14843,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/signal.c linux-3.10.19-vs2.3.6.8/kern
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-3.10.19/kernel/softirq.c linux-3.10.19-vs2.3.6.8/kernel/softirq.c
---- linux-3.10.19/kernel/softirq.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/softirq.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/softirq.c linux-3.10.21-vs2.3.6.8/kernel/softirq.c
+--- linux-3.10.21/kernel/softirq.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/softirq.c 2013-11-13 17:17:16.000000000 +0000
@@ -25,6 +25,7 @@
#include <linux/smp.h>
#include <linux/smpboot.h>
@@ -14852,9 +14854,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/softirq.c linux-3.10.19-vs2.3.6.8/ker
#define CREATE_TRACE_POINTS
#include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.10.19/kernel/sys.c linux-3.10.19-vs2.3.6.8/kernel/sys.c
---- linux-3.10.19/kernel/sys.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sys.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sys.c linux-3.10.21-vs2.3.6.8/kernel/sys.c
+--- linux-3.10.21/kernel/sys.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sys.c 2013-08-22 20:30:00.000000000 +0000
@@ -55,6 +55,7 @@
#include <linux/cred.h>
@@ -14951,9 +14953,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sys.c linux-3.10.19-vs2.3.6.8/kernel/
return 0;
return -EPERM;
-diff -NurpP --minimal linux-3.10.19/kernel/sysctl.c linux-3.10.19-vs2.3.6.8/kernel/sysctl.c
---- linux-3.10.19/kernel/sysctl.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sysctl.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sysctl.c linux-3.10.21-vs2.3.6.8/kernel/sysctl.c
+--- linux-3.10.21/kernel/sysctl.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sysctl.c 2013-08-22 20:30:00.000000000 +0000
@@ -83,6 +83,7 @@
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
#include <linux/lockdep.h>
@@ -14976,9 +14978,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sysctl.c linux-3.10.19-vs2.3.6.8/kern
#ifdef CONFIG_CHR_DEV_SG
{
-diff -NurpP --minimal linux-3.10.19/kernel/sysctl_binary.c linux-3.10.19-vs2.3.6.8/kernel/sysctl_binary.c
---- linux-3.10.19/kernel/sysctl_binary.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/sysctl_binary.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/sysctl_binary.c linux-3.10.21-vs2.3.6.8/kernel/sysctl_binary.c
+--- linux-3.10.21/kernel/sysctl_binary.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/sysctl_binary.c 2013-08-22 20:30:00.000000000 +0000
@@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t
{ CTL_INT, KERN_PANIC, "panic" },
@@ -14987,9 +14989,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/sysctl_binary.c linux-3.10.19-vs2.3.6
{ CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" },
{ CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.10.19/kernel/time/timekeeping.c linux-3.10.19-vs2.3.6.8/kernel/time/timekeeping.c
---- linux-3.10.19/kernel/time/timekeeping.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/time/timekeeping.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/time/timekeeping.c linux-3.10.21-vs2.3.6.8/kernel/time/timekeeping.c
+--- linux-3.10.21/kernel/time/timekeeping.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/time/timekeeping.c 2013-11-13 17:17:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/tick.h>
#include <linux/stop_machine.h>
@@ -15006,9 +15008,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/time/timekeeping.c linux-3.10.19-vs2.
}
EXPORT_SYMBOL(getrawmonotonic);
-diff -NurpP --minimal linux-3.10.19/kernel/time.c linux-3.10.19-vs2.3.6.8/kernel/time.c
---- linux-3.10.19/kernel/time.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/time.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/time.c linux-3.10.21-vs2.3.6.8/kernel/time.c
+--- linux-3.10.21/kernel/time.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/time.c 2013-08-22 20:30:00.000000000 +0000
@@ -37,6 +37,7 @@
#include <linux/fs.h>
#include <linux/math64.h>
@@ -15035,9 +15037,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/time.c linux-3.10.19-vs2.3.6.8/kernel
return 0;
}
-diff -NurpP --minimal linux-3.10.19/kernel/timer.c linux-3.10.19-vs2.3.6.8/kernel/timer.c
---- linux-3.10.19/kernel/timer.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/timer.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/timer.c linux-3.10.21-vs2.3.6.8/kernel/timer.c
+--- linux-3.10.21/kernel/timer.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/timer.c 2013-11-13 17:17:16.000000000 +0000
@@ -42,6 +42,10 @@
#include <linux/sched/sysctl.h>
#include <linux/slab.h>
@@ -15049,9 +15051,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/timer.c linux-3.10.19-vs2.3.6.8/kerne
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-3.10.19/kernel/user_namespace.c linux-3.10.19-vs2.3.6.8/kernel/user_namespace.c
---- linux-3.10.19/kernel/user_namespace.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/user_namespace.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/user_namespace.c linux-3.10.21-vs2.3.6.8/kernel/user_namespace.c
+--- linux-3.10.21/kernel/user_namespace.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/user_namespace.c 2013-11-13 17:17:16.000000000 +0000
@@ -22,6 +22,7 @@
#include <linux/ctype.h>
#include <linux/projid.h>
@@ -15077,9 +15079,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/user_namespace.c linux-3.10.19-vs2.3.
put_user_ns(ns);
}
-diff -NurpP --minimal linux-3.10.19/kernel/utsname.c linux-3.10.19-vs2.3.6.8/kernel/utsname.c
---- linux-3.10.19/kernel/utsname.c 2013-07-14 17:01:35.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/utsname.c 2013-08-22 21:03:08.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/utsname.c linux-3.10.21-vs2.3.6.8/kernel/utsname.c
+--- linux-3.10.21/kernel/utsname.c 2013-07-14 17:01:35.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/utsname.c 2013-08-22 21:03:08.000000000 +0000
@@ -16,14 +16,17 @@
#include <linux/slab.h>
#include <linux/user_namespace.h>
@@ -15108,9 +15110,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/utsname.c linux-3.10.19-vs2.3.6.8/ker
kfree(ns);
}
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/Kconfig linux-3.10.19-vs2.3.6.8/kernel/vserver/Kconfig
---- linux-3.10.19/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/Kconfig 2013-11-14 04:29:47.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/Kconfig linux-3.10.21-vs2.3.6.8/kernel/vserver/Kconfig
+--- linux-3.10.21/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/Kconfig 2013-11-14 04:29:47.000000000 +0000
@@ -0,0 +1,230 @@
+#
+# Linux VServer configuration
@@ -15342,9 +15344,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/Kconfig linux-3.10.19-vs2.3.6
+ bool
+ default n
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/Makefile linux-3.10.19-vs2.3.6.8/kernel/vserver/Makefile
---- linux-3.10.19/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/Makefile 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/Makefile linux-3.10.21-vs2.3.6.8/kernel/vserver/Makefile
+--- linux-3.10.21/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/Makefile 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# Makefile for the Linux vserver routines.
@@ -15364,9 +15366,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/Makefile linux-3.10.19-vs2.3.
+vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
+vserver-$(CONFIG_VSERVER_DEVICE) += device.o
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct.c linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct.c
---- linux-3.10.19/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct.c linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct.c
+--- linux-3.10.21/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+ * linux/kernel/vserver/cacct.c
@@ -15410,9 +15412,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct.c linux-3.10.19-vs2.3.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_init.h
---- linux-3.10.19/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_init.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_init.h
+--- linux-3.10.21/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,25 @@
+
+
@@ -15439,9 +15441,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_init.h linux-3.10.19-vs
+ return;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_proc.h
---- linux-3.10.19/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cacct_proc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cacct_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_proc.h
+--- linux-3.10.21/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cacct_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,53 @@
+#ifndef _VX_CACCT_PROC_H
+#define _VX_CACCT_PROC_H
@@ -15496,9 +15498,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cacct_proc.h linux-3.10.19-vs
+}
+
+#endif /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/context.c linux-3.10.19-vs2.3.6.8/kernel/vserver/context.c
---- linux-3.10.19/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/context.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/context.c linux-3.10.21-vs2.3.6.8/kernel/vserver/context.c
+--- linux-3.10.21/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/context.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,1119 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -16619,9 +16621,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/context.c linux-3.10.19-vs2.3
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt.c linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt.c
---- linux-3.10.19/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt.c linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt.c
+--- linux-3.10.21/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,313 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -16936,9 +16938,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt.c linux-3.10.19-vs2.3.6
+
+#endif
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_init.h
---- linux-3.10.19/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_init.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_init.h
+--- linux-3.10.21/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,70 @@
+
+
@@ -17010,9 +17012,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_init.h linux-3.10.19-vs
+ return;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_proc.h
---- linux-3.10.19/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/cvirt_proc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/cvirt_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_proc.h
+--- linux-3.10.21/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/cvirt_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,123 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -17137,9 +17139,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/cvirt_proc.h linux-3.10.19-vs
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/debug.c linux-3.10.19-vs2.3.6.8/kernel/vserver/debug.c
---- linux-3.10.19/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/debug.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/debug.c linux-3.10.21-vs2.3.6.8/kernel/vserver/debug.c
+--- linux-3.10.21/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/debug.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,32 @@
+/*
+ * kernel/vserver/debug.c
@@ -17173,9 +17175,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/debug.c linux-3.10.19-vs2.3.6
+
+EXPORT_SYMBOL_GPL(dump_vx_info);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/device.c linux-3.10.19-vs2.3.6.8/kernel/vserver/device.c
---- linux-3.10.19/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/device.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/device.c linux-3.10.21-vs2.3.6.8/kernel/vserver/device.c
+--- linux-3.10.21/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/device.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,443 @@
+/*
+ * linux/kernel/vserver/device.c
@@ -17620,9 +17622,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/device.c linux-3.10.19-vs2.3.
+#endif /* CONFIG_COMPAT */
+
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/dlimit.c linux-3.10.19-vs2.3.6.8/kernel/vserver/dlimit.c
---- linux-3.10.19/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/dlimit.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/dlimit.c linux-3.10.21-vs2.3.6.8/kernel/vserver/dlimit.c
+--- linux-3.10.21/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/dlimit.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,528 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -18152,9 +18154,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/dlimit.c linux-3.10.19-vs2.3.
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/helper.c linux-3.10.19-vs2.3.6.8/kernel/vserver/helper.c
---- linux-3.10.19/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/helper.c 2013-08-23 00:55:48.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/helper.c linux-3.10.21-vs2.3.6.8/kernel/vserver/helper.c
+--- linux-3.10.21/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/helper.c 2013-08-23 00:55:48.000000000 +0000
@@ -0,0 +1,242 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -18398,9 +18400,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/helper.c linux-3.10.19-vs2.3.
+ return do_vshelper(vshelper_path, argv, envp, 1);
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/history.c linux-3.10.19-vs2.3.6.8/kernel/vserver/history.c
---- linux-3.10.19/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/history.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/history.c linux-3.10.21-vs2.3.6.8/kernel/vserver/history.c
+--- linux-3.10.21/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/history.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,258 @@
+/*
+ * kernel/vserver/history.c
@@ -18660,9 +18662,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/history.c linux-3.10.19-vs2.3
+
+#endif /* CONFIG_COMPAT */
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/inet.c linux-3.10.19-vs2.3.6.8/kernel/vserver/inet.c
---- linux-3.10.19/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/inet.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/inet.c linux-3.10.21-vs2.3.6.8/kernel/vserver/inet.c
+--- linux-3.10.21/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/inet.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,236 @@
+
+#include <linux/in.h>
@@ -18900,9 +18902,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/inet.c linux-3.10.19-vs2.3.6.
+
+EXPORT_SYMBOL_GPL(ip_v4_find_src);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/init.c linux-3.10.19-vs2.3.6.8/kernel/vserver/init.c
---- linux-3.10.19/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/init.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/init.c linux-3.10.21-vs2.3.6.8/kernel/vserver/init.c
+--- linux-3.10.21/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/init.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * linux/kernel/init.c
@@ -18949,9 +18951,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/init.c linux-3.10.19-vs2.3.6.
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/inode.c linux-3.10.19-vs2.3.6.8/kernel/vserver/inode.c
---- linux-3.10.19/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/inode.c 2013-08-22 23:14:01.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/inode.c linux-3.10.21-vs2.3.6.8/kernel/vserver/inode.c
+--- linux-3.10.21/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/inode.c 2013-08-22 23:14:01.000000000 +0000
@@ -0,0 +1,440 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -19393,9 +19395,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/inode.c linux-3.10.19-vs2.3.6
+
+#endif /* CONFIG_PROPAGATE */
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit.c linux-3.10.19-vs2.3.6.8/kernel/vserver/limit.c
---- linux-3.10.19/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit.c linux-3.10.21-vs2.3.6.8/kernel/vserver/limit.c
+--- linux-3.10.21/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,345 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -19742,9 +19744,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit.c linux-3.10.19-vs2.3.6
+ return cache;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_init.h
---- linux-3.10.19/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_init.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_init.h
+--- linux-3.10.21/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,31 @@
+
+
@@ -19777,9 +19779,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_init.h linux-3.10.19-vs
+ }
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_proc.h
---- linux-3.10.19/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/limit_proc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/limit_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_proc.h
+--- linux-3.10.21/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/limit_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,57 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -19838,9 +19840,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/limit_proc.h linux-3.10.19-vs
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/network.c linux-3.10.19-vs2.3.6.8/kernel/vserver/network.c
---- linux-3.10.19/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/network.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/network.c linux-3.10.21-vs2.3.6.8/kernel/vserver/network.c
+--- linux-3.10.21/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/network.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,1053 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -20895,9 +20897,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/network.c linux-3.10.19-vs2.3
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/proc.c linux-3.10.19-vs2.3.6.8/kernel/vserver/proc.c
---- linux-3.10.19/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/proc.c 2013-08-22 23:31:37.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/proc.c linux-3.10.21-vs2.3.6.8/kernel/vserver/proc.c
+--- linux-3.10.21/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/proc.c 2013-08-22 23:31:37.000000000 +0000
@@ -0,0 +1,1113 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -22012,9 +22014,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/proc.c linux-3.10.19-vs2.3.6.
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched.c linux-3.10.19-vs2.3.6.8/kernel/vserver/sched.c
---- linux-3.10.19/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched.c linux-3.10.21-vs2.3.6.8/kernel/vserver/sched.c
+--- linux-3.10.21/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -22099,9 +22101,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched.c linux-3.10.19-vs2.3.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_init.h linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_init.h
---- linux-3.10.19/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_init.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched_init.h linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_init.h
+--- linux-3.10.21/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_init.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,27 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22130,9 +22132,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_init.h linux-3.10.19-vs
+{
+ return;
+}
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_proc.h linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_proc.h
---- linux-3.10.19/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sched_proc.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/sched_proc.h linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_proc.h
+--- linux-3.10.21/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sched_proc.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,32 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -22166,9 +22168,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sched_proc.h linux-3.10.19-vs
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/signal.c linux-3.10.19-vs2.3.6.8/kernel/vserver/signal.c
---- linux-3.10.19/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/signal.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/signal.c linux-3.10.21-vs2.3.6.8/kernel/vserver/signal.c
+--- linux-3.10.21/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/signal.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -22304,9 +22306,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/signal.c linux-3.10.19-vs2.3.
+ return ret;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/space.c linux-3.10.19-vs2.3.6.8/kernel/vserver/space.c
---- linux-3.10.19/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/space.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/space.c linux-3.10.21-vs2.3.6.8/kernel/vserver/space.c
+--- linux-3.10.21/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/space.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,436 @@
+/*
+ * linux/kernel/vserver/space.c
@@ -22744,9 +22746,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/space.c linux-3.10.19-vs2.3.6
+ return 0;
+}
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/switch.c linux-3.10.19-vs2.3.6.8/kernel/vserver/switch.c
---- linux-3.10.19/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/switch.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/switch.c linux-3.10.21-vs2.3.6.8/kernel/vserver/switch.c
+--- linux-3.10.21/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/switch.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,556 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -23304,9 +23306,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/switch.c linux-3.10.19-vs2.3.
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/sysctl.c linux-3.10.19-vs2.3.6.8/kernel/vserver/sysctl.c
---- linux-3.10.19/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/sysctl.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/sysctl.c linux-3.10.21-vs2.3.6.8/kernel/vserver/sysctl.c
+--- linux-3.10.21/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/sysctl.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,247 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -23555,9 +23557,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/sysctl.c linux-3.10.19-vs2.3.
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/tag.c linux-3.10.19-vs2.3.6.8/kernel/vserver/tag.c
---- linux-3.10.19/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/tag.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/tag.c linux-3.10.21-vs2.3.6.8/kernel/vserver/tag.c
+--- linux-3.10.21/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/tag.c 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+ * linux/kernel/vserver/tag.c
@@ -23622,9 +23624,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/tag.c linux-3.10.19-vs2.3.6.8
+}
+
+
-diff -NurpP --minimal linux-3.10.19/kernel/vserver/vci_config.h linux-3.10.19-vs2.3.6.8/kernel/vserver/vci_config.h
---- linux-3.10.19/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/kernel/vserver/vci_config.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/kernel/vserver/vci_config.h linux-3.10.21-vs2.3.6.8/kernel/vserver/vci_config.h
+--- linux-3.10.21/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/kernel/vserver/vci_config.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,80 @@
+
+/* interface version */
@@ -23706,9 +23708,9 @@ diff -NurpP --minimal linux-3.10.19/kernel/vserver/vci_config.h linux-3.10.19-vs
+ 0;
+}
+
-diff -NurpP --minimal linux-3.10.19/mm/memcontrol.c linux-3.10.19-vs2.3.6.8/mm/memcontrol.c
---- linux-3.10.19/mm/memcontrol.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/memcontrol.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/memcontrol.c linux-3.10.21-vs2.3.6.8/mm/memcontrol.c
+--- linux-3.10.21/mm/memcontrol.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/memcontrol.c 2013-11-13 17:17:16.000000000 +0000
@@ -1082,6 +1082,31 @@ struct mem_cgroup *mem_cgroup_from_task(
return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id));
}
@@ -23741,9 +23743,9 @@ diff -NurpP --minimal linux-3.10.19/mm/memcontrol.c linux-3.10.19-vs2.3.6.8/mm/m
struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
{
struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.10.19/mm/oom_kill.c linux-3.10.19-vs2.3.6.8/mm/oom_kill.c
---- linux-3.10.19/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/oom_kill.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/oom_kill.c linux-3.10.21-vs2.3.6.8/mm/oom_kill.c
+--- linux-3.10.21/mm/oom_kill.c 2013-05-31 13:45:31.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/oom_kill.c 2013-08-22 20:30:00.000000000 +0000
@@ -35,6 +35,8 @@
#include <linux/freezer.h>
#include <linux/ftrace.h>
@@ -23818,9 +23820,9 @@ diff -NurpP --minimal linux-3.10.19/mm/oom_kill.c linux-3.10.19-vs2.3.6.8/mm/oom
}
if (PTR_ERR(p) != -1UL) {
oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.10.19/mm/page_alloc.c linux-3.10.19-vs2.3.6.8/mm/page_alloc.c
---- linux-3.10.19/mm/page_alloc.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/page_alloc.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/page_alloc.c linux-3.10.21-vs2.3.6.8/mm/page_alloc.c
+--- linux-3.10.21/mm/page_alloc.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/page_alloc.c 2013-11-13 17:17:16.000000000 +0000
@@ -60,6 +60,8 @@
#include <linux/page-debug-flags.h>
#include <linux/hugetlb.h>
@@ -23850,9 +23852,9 @@ diff -NurpP --minimal linux-3.10.19/mm/page_alloc.c linux-3.10.19-vs2.3.6.8/mm/p
}
#endif
-diff -NurpP --minimal linux-3.10.19/mm/pgtable-generic.c linux-3.10.19-vs2.3.6.8/mm/pgtable-generic.c
---- linux-3.10.19/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/pgtable-generic.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/pgtable-generic.c linux-3.10.21-vs2.3.6.8/mm/pgtable-generic.c
+--- linux-3.10.21/mm/pgtable-generic.c 2013-02-19 13:58:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/pgtable-generic.c 2013-08-22 20:30:00.000000000 +0000
@@ -6,6 +6,8 @@
* Copyright (C) 2010 Linus Torvalds
*/
@@ -23862,9 +23864,9 @@ diff -NurpP --minimal linux-3.10.19/mm/pgtable-generic.c linux-3.10.19-vs2.3.6.8
#include <linux/pagemap.h>
#include <asm/tlb.h>
#include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.10.19/mm/shmem.c linux-3.10.19-vs2.3.6.8/mm/shmem.c
---- linux-3.10.19/mm/shmem.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/shmem.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/shmem.c linux-3.10.21-vs2.3.6.8/mm/shmem.c
+--- linux-3.10.21/mm/shmem.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/shmem.c 2013-11-13 17:17:16.000000000 +0000
@@ -1911,7 +1911,7 @@ static int shmem_statfs(struct dentry *d
{
struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -23883,9 +23885,9 @@ diff -NurpP --minimal linux-3.10.19/mm/shmem.c linux-3.10.19-vs2.3.6.8/mm/shmem.
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
#ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.10.19/mm/slab.c linux-3.10.19-vs2.3.6.8/mm/slab.c
---- linux-3.10.19/mm/slab.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/slab.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/slab.c linux-3.10.21-vs2.3.6.8/mm/slab.c
+--- linux-3.10.21/mm/slab.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/slab.c 2013-11-13 17:17:16.000000000 +0000
@@ -388,6 +388,8 @@ static void kmem_cache_node_init(struct
#define STATS_INC_FREEMISS(x) do { } while (0)
#endif
@@ -23919,9 +23921,9 @@ diff -NurpP --minimal linux-3.10.19/mm/slab.c linux-3.10.19-vs2.3.6.8/mm/slab.c
kmemcheck_slab_free(cachep, objp, cachep->object_size);
-diff -NurpP --minimal linux-3.10.19/mm/slab_vs.h linux-3.10.19-vs2.3.6.8/mm/slab_vs.h
---- linux-3.10.19/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/slab_vs.h 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/slab_vs.h linux-3.10.21-vs2.3.6.8/mm/slab_vs.h
+--- linux-3.10.21/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/slab_vs.h 2013-08-22 20:30:00.000000000 +0000
@@ -0,0 +1,29 @@
+
+#include <linux/vserver/context.h>
@@ -23952,9 +23954,9 @@ diff -NurpP --minimal linux-3.10.19/mm/slab_vs.h linux-3.10.19-vs2.3.6.8/mm/slab
+ atomic_sub(cachep->size, &vxi->cacct.slab[what]);
+}
+
-diff -NurpP --minimal linux-3.10.19/mm/swapfile.c linux-3.10.19-vs2.3.6.8/mm/swapfile.c
---- linux-3.10.19/mm/swapfile.c 2013-07-14 17:01:36.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/mm/swapfile.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/mm/swapfile.c linux-3.10.21-vs2.3.6.8/mm/swapfile.c
+--- linux-3.10.21/mm/swapfile.c 2013-07-14 17:01:36.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/mm/swapfile.c 2013-08-22 20:30:00.000000000 +0000
@@ -39,6 +39,7 @@
#include <asm/tlbflush.h>
#include <linux/swapops.h>
@@ -23989,9 +23991,9 @@ diff -NurpP --minimal linux-3.10.19/mm/swapfile.c linux-3.10.19-vs2.3.6.8/mm/swa
}
/*
-diff -NurpP --minimal linux-3.10.19/net/bridge/br_multicast.c linux-3.10.19-vs2.3.6.8/net/bridge/br_multicast.c
---- linux-3.10.19/net/bridge/br_multicast.c 2013-11-13 17:21:14.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/bridge/br_multicast.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/bridge/br_multicast.c linux-3.10.21-vs2.3.6.8/net/bridge/br_multicast.c
+--- linux-3.10.21/net/bridge/br_multicast.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/bridge/br_multicast.c 2013-11-13 17:17:16.000000000 +0000
@@ -443,7 +443,7 @@ static struct sk_buff *br_ip6_multicast_
ip6h->hop_limit = 1;
ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -24001,9 +24003,9 @@ diff -NurpP --minimal linux-3.10.19/net/bridge/br_multicast.c linux-3.10.19-vs2.
kfree_skb(skb);
return NULL;
}
-diff -NurpP --minimal linux-3.10.19/net/core/dev.c linux-3.10.19-vs2.3.6.8/net/core/dev.c
---- linux-3.10.19/net/core/dev.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/core/dev.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/core/dev.c linux-3.10.21-vs2.3.6.8/net/core/dev.c
+--- linux-3.10.21/net/core/dev.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/core/dev.c 2013-11-13 17:17:16.000000000 +0000
@@ -122,6 +122,7 @@
#include <linux/in.h>
#include <linux/jhash.h>
@@ -24121,9 +24123,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/dev.c linux-3.10.19-vs2.3.6.8/net/c
/* avoid cases where sscanf is not exact inverse of printf */
snprintf(buf, IFNAMSIZ, name, i);
-diff -NurpP --minimal linux-3.10.19/net/core/net-procfs.c linux-3.10.19-vs2.3.6.8/net/core/net-procfs.c
---- linux-3.10.19/net/core/net-procfs.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/core/net-procfs.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/core/net-procfs.c linux-3.10.21-vs2.3.6.8/net/core/net-procfs.c
+--- linux-3.10.21/net/core/net-procfs.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/core/net-procfs.c 2013-08-22 20:30:00.000000000 +0000
@@ -1,6 +1,7 @@
#include <linux/netdevice.h>
#include <linux/proc_fs.h>
@@ -24147,9 +24149,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/net-procfs.c linux-3.10.19-vs2.3.6.
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-3.10.19/net/core/rtnetlink.c linux-3.10.19-vs2.3.6.8/net/core/rtnetlink.c
---- linux-3.10.19/net/core/rtnetlink.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/core/rtnetlink.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/core/rtnetlink.c linux-3.10.21-vs2.3.6.8/net/core/rtnetlink.c
+--- linux-3.10.21/net/core/rtnetlink.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/core/rtnetlink.c 2013-11-13 17:17:16.000000000 +0000
@@ -1059,6 +1059,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
hlist_for_each_entry_rcu(dev, head, index_hlist) {
if (idx < s_idx)
@@ -24169,9 +24171,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/rtnetlink.c linux-3.10.19-vs2.3.6.8
skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
if (skb == NULL)
goto errout;
-diff -NurpP --minimal linux-3.10.19/net/core/sock.c linux-3.10.19-vs2.3.6.8/net/core/sock.c
---- linux-3.10.19/net/core/sock.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/core/sock.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/core/sock.c linux-3.10.21-vs2.3.6.8/net/core/sock.c
+--- linux-3.10.21/net/core/sock.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/core/sock.c 2013-11-13 17:22:25.000000000 +0000
@@ -132,6 +132,10 @@
#include <net/netprio_cgroup.h>
@@ -24239,9 +24241,9 @@ diff -NurpP --minimal linux-3.10.19/net/core/sock.c linux-3.10.19-vs2.3.6.8/net/
sk->sk_pacing_rate = ~0U;
/*
* Before updating sk_refcnt, we must commit prior changes to memory
-diff -NurpP --minimal linux-3.10.19/net/ipv4/af_inet.c linux-3.10.19-vs2.3.6.8/net/ipv4/af_inet.c
---- linux-3.10.19/net/ipv4/af_inet.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/af_inet.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/af_inet.c linux-3.10.21-vs2.3.6.8/net/ipv4/af_inet.c
+--- linux-3.10.21/net/ipv4/af_inet.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/af_inet.c 2013-11-13 17:17:16.000000000 +0000
@@ -118,6 +118,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -24319,9 +24321,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/af_inet.c linux-3.10.19-vs2.3.6.8/n
sin->sin_port = inet->inet_sport;
sin->sin_addr.s_addr = addr;
}
-diff -NurpP --minimal linux-3.10.19/net/ipv4/arp.c linux-3.10.19-vs2.3.6.8/net/ipv4/arp.c
---- linux-3.10.19/net/ipv4/arp.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/arp.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/arp.c linux-3.10.21-vs2.3.6.8/net/ipv4/arp.c
+--- linux-3.10.21/net/ipv4/arp.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/arp.c 2013-08-22 20:30:00.000000000 +0000
@@ -1332,6 +1332,7 @@ static void arp_format_neigh_entry(struc
struct net_device *dev = n->dev;
int hatype = dev->type;
@@ -24338,9 +24340,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/arp.c linux-3.10.19-vs2.3.6.8/net/i
sprintf(tbuf, "%pI4", n->key);
seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n",
tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00",
-diff -NurpP --minimal linux-3.10.19/net/ipv4/devinet.c linux-3.10.19-vs2.3.6.8/net/ipv4/devinet.c
---- linux-3.10.19/net/ipv4/devinet.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/devinet.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/devinet.c linux-3.10.21-vs2.3.6.8/net/ipv4/devinet.c
+--- linux-3.10.21/net/ipv4/devinet.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/devinet.c 2013-11-13 17:17:16.000000000 +0000
@@ -522,6 +522,7 @@ struct in_device *inetdev_by_index(struc
}
EXPORT_SYMBOL(inetdev_by_index);
@@ -24407,9 +24409,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/devinet.c linux-3.10.19-vs2.3.6.8/n
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.10.19/net/ipv4/fib_trie.c linux-3.10.19-vs2.3.6.8/net/ipv4/fib_trie.c
---- linux-3.10.19/net/ipv4/fib_trie.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/fib_trie.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/fib_trie.c linux-3.10.21-vs2.3.6.8/net/ipv4/fib_trie.c
+--- linux-3.10.21/net/ipv4/fib_trie.c 2013-11-30 07:50:51.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/fib_trie.c 2013-11-13 17:17:16.000000000 +0000
@@ -2536,6 +2536,7 @@ static int fib_route_seq_show(struct seq
|| fa->fa_type == RTN_MULTICAST)
continue;
@@ -24418,9 +24420,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/fib_trie.c linux-3.10.19-vs2.3.6.8/
if (fi)
seq_printf(seq,
"%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_connection_sock.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_connection_sock.c
---- linux-3.10.19/net/ipv4/inet_connection_sock.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_connection_sock.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_connection_sock.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_connection_sock.c
+--- linux-3.10.21/net/ipv4/inet_connection_sock.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_connection_sock.c 2013-08-22 20:30:00.000000000 +0000
@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
}
EXPORT_SYMBOL(inet_get_local_port_range);
@@ -24479,9 +24481,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_connection_sock.c linux-3.10.1
break;
}
}
-diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_diag.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_diag.c
---- linux-3.10.19/net/ipv4/inet_diag.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_diag.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_diag.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_diag.c
+--- linux-3.10.21/net/ipv4/inet_diag.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_diag.c 2013-08-22 20:30:00.000000000 +0000
@@ -31,6 +31,8 @@
#include <linux/inet.h>
@@ -24593,9 +24595,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_diag.c linux-3.10.19-vs2.3.6.8
if (num < s_num)
goto next_dying;
if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_hashtables.c linux-3.10.19-vs2.3.6.8/net/ipv4/inet_hashtables.c
---- linux-3.10.19/net/ipv4/inet_hashtables.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/inet_hashtables.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/inet_hashtables.c linux-3.10.21-vs2.3.6.8/net/ipv4/inet_hashtables.c
+--- linux-3.10.21/net/ipv4/inet_hashtables.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/inet_hashtables.c 2013-11-13 17:22:25.000000000 +0000
@@ -22,6 +22,7 @@
#include <net/inet_connection_sock.h>
#include <net/inet_hashtables.h>
@@ -24632,9 +24634,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/inet_hashtables.c linux-3.10.19-vs2
/*
* if the nulls value we got at the end of this lookup is
* not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.10.19/net/ipv4/netfilter.c linux-3.10.19-vs2.3.6.8/net/ipv4/netfilter.c
---- linux-3.10.19/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/netfilter.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/netfilter.c linux-3.10.21-vs2.3.6.8/net/ipv4/netfilter.c
+--- linux-3.10.21/net/ipv4/netfilter.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/netfilter.c 2013-08-22 20:30:00.000000000 +0000
@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/gfp.h>
@@ -24644,9 +24646,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/netfilter.c linux-3.10.19-vs2.3.6.8
#include <net/xfrm.h>
#include <net/ip.h>
#include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.10.19/net/ipv4/raw.c linux-3.10.19-vs2.3.6.8/net/ipv4/raw.c
---- linux-3.10.19/net/ipv4/raw.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/raw.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/raw.c linux-3.10.21-vs2.3.6.8/net/ipv4/raw.c
+--- linux-3.10.21/net/ipv4/raw.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/raw.c 2013-11-13 17:17:16.000000000 +0000
@@ -116,7 +116,7 @@ static struct sock *__raw_v4_lookup(stru
if (net_eq(sock_net(sk), net) && inet->inet_num == num &&
@@ -24739,9 +24741,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/raw.c linux-3.10.19-vs2.3.6.8/net/i
if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.10.19/net/ipv4/route.c linux-3.10.19-vs2.3.6.8/net/ipv4/route.c
---- linux-3.10.19/net/ipv4/route.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/route.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/route.c linux-3.10.21-vs2.3.6.8/net/ipv4/route.c
+--- linux-3.10.21/net/ipv4/route.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/route.c 2013-11-13 17:22:25.000000000 +0000
@@ -2003,7 +2003,7 @@ struct rtable *__ip_route_output_key(str
@@ -24751,9 +24753,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/route.c linux-3.10.19-vs2.3.6.8/net
rth = ERR_PTR(-ENODEV);
if (dev_out == NULL)
goto out;
-diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp.c
---- linux-3.10.19/net/ipv4/tcp.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp.c
+--- linux-3.10.21/net/ipv4/tcp.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp.c 2013-11-13 17:22:25.000000000 +0000
@@ -268,6 +268,7 @@
#include <linux/crypto.h>
#include <linux/time.h>
@@ -24762,9 +24764,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp.c linux-3.10.19-vs2.3.6.8/net/i
#include <net/icmp.h>
#include <net/inet_common.h>
-diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_ipv4.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_ipv4.c
---- linux-3.10.19/net/ipv4/tcp_ipv4.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_ipv4.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp_ipv4.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_ipv4.c
+--- linux-3.10.21/net/ipv4/tcp_ipv4.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_ipv4.c 2013-08-22 20:30:00.000000000 +0000
@@ -2263,6 +2263,12 @@ static void *listening_get_next(struct s
req = req->dl_next;
while (1) {
@@ -24870,9 +24872,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_ipv4.c linux-3.10.19-vs2.3.6.8/
destp = ntohs(tw->tw_dport);
srcp = ntohs(tw->tw_sport);
-diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_minisocks.c linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_minisocks.c
---- linux-3.10.19/net/ipv4/tcp_minisocks.c 2013-07-14 17:01:37.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/tcp_minisocks.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/tcp_minisocks.c linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_minisocks.c
+--- linux-3.10.21/net/ipv4/tcp_minisocks.c 2013-07-14 17:01:37.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/tcp_minisocks.c 2013-08-22 20:30:00.000000000 +0000
@@ -23,6 +23,9 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
@@ -24895,9 +24897,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/tcp_minisocks.c linux-3.10.19-vs2.3
#if IS_ENABLED(CONFIG_IPV6)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.10.19/net/ipv4/udp.c linux-3.10.19-vs2.3.6.8/net/ipv4/udp.c
---- linux-3.10.19/net/ipv4/udp.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv4/udp.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv4/udp.c linux-3.10.21-vs2.3.6.8/net/ipv4/udp.c
+--- linux-3.10.21/net/ipv4/udp.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv4/udp.c 2013-11-13 17:17:16.000000000 +0000
@@ -306,14 +306,7 @@ fail:
}
EXPORT_SYMBOL(udp_lib_get_port);
@@ -25030,9 +25032,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv4/udp.c linux-3.10.19-vs2.3.6.8/net/i
__u16 destp = ntohs(inet->inet_dport);
__u16 srcp = ntohs(inet->inet_sport);
-diff -NurpP --minimal linux-3.10.19/net/ipv6/Kconfig linux-3.10.19-vs2.3.6.8/net/ipv6/Kconfig
---- linux-3.10.19/net/ipv6/Kconfig 2013-07-14 17:01:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/Kconfig 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/Kconfig linux-3.10.21-vs2.3.6.8/net/ipv6/Kconfig
+--- linux-3.10.21/net/ipv6/Kconfig 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/Kconfig 2013-08-22 20:30:00.000000000 +0000
@@ -4,8 +4,8 @@
# IPv6 as module will cause a CRASH if you try to unload it
@@ -25044,9 +25046,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/Kconfig linux-3.10.19-vs2.3.6.8/net
---help---
This is complemental support for the IP version 6.
You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.10.19/net/ipv6/addrconf.c linux-3.10.19-vs2.3.6.8/net/ipv6/addrconf.c
---- linux-3.10.19/net/ipv6/addrconf.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/addrconf.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/addrconf.c linux-3.10.21-vs2.3.6.8/net/ipv6/addrconf.c
+--- linux-3.10.21/net/ipv6/addrconf.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/addrconf.c 2013-11-13 17:17:16.000000000 +0000
@@ -94,6 +94,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@ -25153,9 +25155,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/addrconf.c linux-3.10.19-vs2.3.6.8/
idev = __in6_dev_get(dev);
if (!idev)
goto cont;
-diff -NurpP --minimal linux-3.10.19/net/ipv6/af_inet6.c linux-3.10.19-vs2.3.6.8/net/ipv6/af_inet6.c
---- linux-3.10.19/net/ipv6/af_inet6.c 2013-07-14 17:01:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/af_inet6.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/af_inet6.c linux-3.10.21-vs2.3.6.8/net/ipv6/af_inet6.c
+--- linux-3.10.21/net/ipv6/af_inet6.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/af_inet6.c 2013-08-22 20:30:00.000000000 +0000
@@ -43,6 +43,8 @@
#include <linux/netdevice.h>
#include <linux/icmpv6.h>
@@ -25252,9 +25254,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/af_inet6.c linux-3.10.19-vs2.3.6.8/
if (ipv6_addr_any(&np->rcv_saddr))
sin->sin6_addr = np->saddr;
else
-diff -NurpP --minimal linux-3.10.19/net/ipv6/datagram.c linux-3.10.19-vs2.3.6.8/net/ipv6/datagram.c
---- linux-3.10.19/net/ipv6/datagram.c 2013-07-14 17:01:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/datagram.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/datagram.c linux-3.10.21-vs2.3.6.8/net/ipv6/datagram.c
+--- linux-3.10.21/net/ipv6/datagram.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/datagram.c 2013-08-22 20:30:00.000000000 +0000
@@ -652,7 +652,7 @@ int ip6_datagram_send_ctl(struct net *ne
rcu_read_lock();
@@ -25264,9 +25266,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/datagram.c linux-3.10.19-vs2.3.6.8/
if (!dev) {
rcu_read_unlock();
return -ENODEV;
-diff -NurpP --minimal linux-3.10.19/net/ipv6/fib6_rules.c linux-3.10.19-vs2.3.6.8/net/ipv6/fib6_rules.c
---- linux-3.10.19/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/fib6_rules.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/fib6_rules.c linux-3.10.21-vs2.3.6.8/net/ipv6/fib6_rules.c
+--- linux-3.10.21/net/ipv6/fib6_rules.c 2013-02-19 13:58:58.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/fib6_rules.c 2013-08-22 20:30:00.000000000 +0000
@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
ip6_dst_idev(&rt->dst)->dev,
&flp6->daddr,
@@ -25276,9 +25278,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/fib6_rules.c linux-3.10.19-vs2.3.6.
goto again;
if (!ipv6_prefix_equal(&saddr, &r->src.addr,
r->src.plen))
-diff -NurpP --minimal linux-3.10.19/net/ipv6/inet6_hashtables.c linux-3.10.19-vs2.3.6.8/net/ipv6/inet6_hashtables.c
---- linux-3.10.19/net/ipv6/inet6_hashtables.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/inet6_hashtables.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/inet6_hashtables.c linux-3.10.21-vs2.3.6.8/net/ipv6/inet6_hashtables.c
+--- linux-3.10.21/net/ipv6/inet6_hashtables.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/inet6_hashtables.c 2013-11-13 17:22:25.000000000 +0000
@@ -16,6 +16,7 @@
#include <linux/module.h>
@@ -25314,9 +25316,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/inet6_hashtables.c linux-3.10.19-vs
}
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.10.19/net/ipv6/ip6_output.c linux-3.10.19-vs2.3.6.8/net/ipv6/ip6_output.c
---- linux-3.10.19/net/ipv6/ip6_output.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/ip6_output.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/ip6_output.c linux-3.10.21-vs2.3.6.8/net/ipv6/ip6_output.c
+--- linux-3.10.21/net/ipv6/ip6_output.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/ip6_output.c 2013-11-13 17:22:25.000000000 +0000
@@ -882,7 +882,8 @@ static int ip6_dst_lookup_tail(struct so
struct rt6_info *rt = (struct rt6_info *) *dst;
err = ip6_route_get_saddr(net, rt, &fl6->daddr,
@@ -25327,9 +25329,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/ip6_output.c linux-3.10.19-vs2.3.6.
if (err)
goto out_err_release;
}
-diff -NurpP --minimal linux-3.10.19/net/ipv6/ndisc.c linux-3.10.19-vs2.3.6.8/net/ipv6/ndisc.c
---- linux-3.10.19/net/ipv6/ndisc.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/ndisc.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/ndisc.c linux-3.10.21-vs2.3.6.8/net/ipv6/ndisc.c
+--- linux-3.10.21/net/ipv6/ndisc.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/ndisc.c 2013-11-13 17:17:16.000000000 +0000
@@ -487,7 +487,7 @@ static void ndisc_send_na(struct net_dev
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -25339,9 +25341,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/ndisc.c linux-3.10.19-vs2.3.6.8/net
return;
src_addr = &tmpaddr;
}
-diff -NurpP --minimal linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.10.19-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c
---- linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3.10.21-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c
+--- linux-3.10.21/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/netfilter/ip6t_MASQUERADE.c 2013-08-22 20:30:00.000000000 +0000
@@ -34,7 +34,7 @@ masquerade_tg6(struct sk_buff *skb, cons
ctinfo == IP_CT_RELATED_REPLY));
@@ -25351,9 +25353,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/netfilter/ip6t_MASQUERADE.c linux-3
return NF_DROP;
nfct_nat(ct)->masq_index = par->out->ifindex;
-diff -NurpP --minimal linux-3.10.19/net/ipv6/raw.c linux-3.10.19-vs2.3.6.8/net/ipv6/raw.c
---- linux-3.10.19/net/ipv6/raw.c 2013-07-14 17:01:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/raw.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/raw.c linux-3.10.21-vs2.3.6.8/net/ipv6/raw.c
+--- linux-3.10.21/net/ipv6/raw.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/raw.c 2013-08-22 20:30:00.000000000 +0000
@@ -30,6 +30,7 @@
#include <linux/icmpv6.h>
#include <linux/netfilter.h>
@@ -25376,9 +25378,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/raw.c linux-3.10.19-vs2.3.6.8/net/i
/* ipv4 addr of the socket is invalid. Only the
* unspecified and mapped address have a v4 equivalent.
*/
-diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net/ipv6/route.c
---- linux-3.10.19/net/ipv6/route.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/route.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/route.c linux-3.10.21-vs2.3.6.8/net/ipv6/route.c
+--- linux-3.10.21/net/ipv6/route.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/route.c 2013-11-30 07:53:00.000000000 +0000
@@ -58,6 +58,7 @@
#include <net/netevent.h>
#include <net/netlink.h>
@@ -25387,7 +25389,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
#include <asm/uaccess.h>
-@@ -2129,15 +2130,17 @@ int ip6_route_get_saddr(struct net *net,
+@@ -2132,15 +2133,17 @@ int ip6_route_get_saddr(struct net *net,
struct rt6_info *rt,
const struct in6_addr *daddr,
unsigned int prefs,
@@ -25408,7 +25410,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
return err;
}
-@@ -2557,7 +2560,8 @@ static int rt6_fill_node(struct net *net
+@@ -2560,7 +2563,8 @@ static int rt6_fill_node(struct net *net
goto nla_put_failure;
} else if (dst) {
struct in6_addr saddr_buf;
@@ -25418,7 +25420,7 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
nla_put(skb, RTA_PREFSRC, 16, &saddr_buf))
goto nla_put_failure;
}
-@@ -2769,6 +2773,7 @@ static int rt6_info_route(struct rt6_inf
+@@ -2772,6 +2776,7 @@ static int rt6_info_route(struct rt6_inf
{
struct seq_file *m = p_arg;
@@ -25426,9 +25428,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/route.c linux-3.10.19-vs2.3.6.8/net
seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.10.19/net/ipv6/tcp_ipv6.c linux-3.10.19-vs2.3.6.8/net/ipv6/tcp_ipv6.c
---- linux-3.10.19/net/ipv6/tcp_ipv6.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/tcp_ipv6.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/tcp_ipv6.c linux-3.10.21-vs2.3.6.8/net/ipv6/tcp_ipv6.c
+--- linux-3.10.21/net/ipv6/tcp_ipv6.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/tcp_ipv6.c 2013-11-13 17:17:16.000000000 +0000
@@ -71,6 +71,7 @@
#include <linux/crypto.h>
@@ -25455,9 +25457,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/tcp_ipv6.c linux-3.10.19-vs2.3.6.8/
addr_type = ipv6_addr_type(&usin->sin6_addr);
-diff -NurpP --minimal linux-3.10.19/net/ipv6/udp.c linux-3.10.19-vs2.3.6.8/net/ipv6/udp.c
---- linux-3.10.19/net/ipv6/udp.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/udp.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/udp.c linux-3.10.21-vs2.3.6.8/net/ipv6/udp.c
+--- linux-3.10.21/net/ipv6/udp.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/udp.c 2013-11-13 17:17:16.000000000 +0000
@@ -46,42 +46,68 @@
#include <net/ip6_checksum.h>
#include <net/xfrm.h>
@@ -25551,9 +25553,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/udp.c linux-3.10.19-vs2.3.6.8/net/i
}
if (!ipv6_addr_any(&np->daddr)) {
if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.10.19/net/ipv6/xfrm6_policy.c linux-3.10.19-vs2.3.6.8/net/ipv6/xfrm6_policy.c
---- linux-3.10.19/net/ipv6/xfrm6_policy.c 2013-07-14 17:01:38.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/ipv6/xfrm6_policy.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/ipv6/xfrm6_policy.c linux-3.10.21-vs2.3.6.8/net/ipv6/xfrm6_policy.c
+--- linux-3.10.21/net/ipv6/xfrm6_policy.c 2013-07-14 17:01:38.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/ipv6/xfrm6_policy.c 2013-08-22 20:30:00.000000000 +0000
@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
dev = ip6_dst_idev(dst)->dev;
ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -25563,9 +25565,9 @@ diff -NurpP --minimal linux-3.10.19/net/ipv6/xfrm6_policy.c linux-3.10.19-vs2.3.
dst_release(dst);
return 0;
}
-diff -NurpP --minimal linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.19-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.21-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.10.21/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/netfilter/ipvs/ip_vs_xmit.c 2013-11-13 17:17:16.000000000 +0000
@@ -316,7 +316,7 @@ __ip_vs_route_output_v6(struct net *net,
return dst;
if (ipv6_addr_any(&fl6.saddr) &&
@@ -25575,9 +25577,9 @@ diff -NurpP --minimal linux-3.10.19/net/netfilter/ipvs/ip_vs_xmit.c linux-3.10.1
goto out_err;
if (do_xfrm) {
dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.10.19/net/netlink/af_netlink.c linux-3.10.19-vs2.3.6.8/net/netlink/af_netlink.c
---- linux-3.10.19/net/netlink/af_netlink.c 2013-07-14 17:01:39.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/netlink/af_netlink.c 2013-08-22 21:19:02.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/netlink/af_netlink.c linux-3.10.21-vs2.3.6.8/net/netlink/af_netlink.c
+--- linux-3.10.21/net/netlink/af_netlink.c 2013-07-14 17:01:39.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/netlink/af_netlink.c 2013-08-22 21:19:02.000000000 +0000
@@ -57,6 +57,9 @@
#include <linux/audit.h>
#include <linux/mutex.h>
@@ -25617,9 +25619,9 @@ diff -NurpP --minimal linux-3.10.19/net/netlink/af_netlink.c linux-3.10.19-vs2.3
s = sk_next(s);
if (s) {
iter->link = i;
-diff -NurpP --minimal linux-3.10.19/net/socket.c linux-3.10.19-vs2.3.6.8/net/socket.c
---- linux-3.10.19/net/socket.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/socket.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/socket.c linux-3.10.21-vs2.3.6.8/net/socket.c
+--- linux-3.10.21/net/socket.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/socket.c 2013-11-13 17:22:25.000000000 +0000
@@ -98,6 +98,10 @@
#include <net/sock.h>
@@ -25725,9 +25727,9 @@ diff -NurpP --minimal linux-3.10.19/net/socket.c linux-3.10.19-vs2.3.6.8/net/soc
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth.c linux-3.10.19-vs2.3.6.8/net/sunrpc/auth.c
---- linux-3.10.19/net/sunrpc/auth.c 2013-07-14 17:01:39.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/auth.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/sunrpc/auth.c linux-3.10.21-vs2.3.6.8/net/sunrpc/auth.c
+--- linux-3.10.21/net/sunrpc/auth.c 2013-07-14 17:01:39.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/sunrpc/auth.c 2013-08-22 20:30:00.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/gss_api.h>
@@ -25752,9 +25754,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth.c linux-3.10.19-vs2.3.6.8/ne
};
dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth_unix.c linux-3.10.19-vs2.3.6.8/net/sunrpc/auth_unix.c
---- linux-3.10.19/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/auth_unix.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/sunrpc/auth_unix.c linux-3.10.21-vs2.3.6.8/net/sunrpc/auth_unix.c
+--- linux-3.10.21/net/sunrpc/auth_unix.c 2013-05-31 13:45:33.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/sunrpc/auth_unix.c 2013-08-22 20:30:00.000000000 +0000
@@ -13,11 +13,13 @@
#include <linux/sunrpc/clnt.h>
#include <linux/sunrpc/auth.h>
@@ -25811,9 +25813,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/auth_unix.c linux-3.10.19-vs2.3.6
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-3.10.19/net/sunrpc/clnt.c linux-3.10.19-vs2.3.6.8/net/sunrpc/clnt.c
---- linux-3.10.19/net/sunrpc/clnt.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/sunrpc/clnt.c 2013-11-13 17:17:16.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/sunrpc/clnt.c linux-3.10.21-vs2.3.6.8/net/sunrpc/clnt.c
+--- linux-3.10.21/net/sunrpc/clnt.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/sunrpc/clnt.c 2013-11-30 07:53:00.000000000 +0000
@@ -31,6 +31,7 @@
#include <linux/in6.h>
#include <linux/un.h>
@@ -25832,9 +25834,9 @@ diff -NurpP --minimal linux-3.10.19/net/sunrpc/clnt.c linux-3.10.19-vs2.3.6.8/ne
return clnt;
}
EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.10.19/net/unix/af_unix.c linux-3.10.19-vs2.3.6.8/net/unix/af_unix.c
---- linux-3.10.19/net/unix/af_unix.c 2013-11-13 17:21:15.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/net/unix/af_unix.c 2013-11-13 17:22:25.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/net/unix/af_unix.c linux-3.10.21-vs2.3.6.8/net/unix/af_unix.c
+--- linux-3.10.21/net/unix/af_unix.c 2013-11-30 07:50:52.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/net/unix/af_unix.c 2013-11-13 17:22:25.000000000 +0000
@@ -114,6 +114,8 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -25871,9 +25873,9 @@ diff -NurpP --minimal linux-3.10.19/net/unix/af_unix.c linux-3.10.19-vs2.3.6.8/n
if (sock_net(sk) == seq_file_net(seq))
return sk;
}
-diff -NurpP --minimal linux-3.10.19/scripts/checksyscalls.sh linux-3.10.19-vs2.3.6.8/scripts/checksyscalls.sh
---- linux-3.10.19/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/scripts/checksyscalls.sh 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/scripts/checksyscalls.sh linux-3.10.21-vs2.3.6.8/scripts/checksyscalls.sh
+--- linux-3.10.21/scripts/checksyscalls.sh 2012-12-11 03:30:57.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/scripts/checksyscalls.sh 2013-08-22 20:30:00.000000000 +0000
@@ -193,7 +193,6 @@ cat << EOF
#define __IGNORE_afs_syscall
#define __IGNORE_getpmsg
@@ -25882,9 +25884,9 @@ diff -NurpP --minimal linux-3.10.19/scripts/checksyscalls.sh linux-3.10.19-vs2.3
EOF
}
-diff -NurpP --minimal linux-3.10.19/security/commoncap.c linux-3.10.19-vs2.3.6.8/security/commoncap.c
---- linux-3.10.19/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/security/commoncap.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/security/commoncap.c linux-3.10.21-vs2.3.6.8/security/commoncap.c
+--- linux-3.10.21/security/commoncap.c 2013-05-31 13:45:34.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/security/commoncap.c 2013-08-22 20:30:00.000000000 +0000
@@ -76,6 +76,7 @@ int cap_netlink_send(struct sock *sk, st
int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
int cap, int audit)
@@ -25926,9 +25928,9 @@ diff -NurpP --minimal linux-3.10.19/security/commoncap.c linux-3.10.19-vs2.3.6.8
return -EPERM;
return 0;
}
-diff -NurpP --minimal linux-3.10.19/security/selinux/hooks.c linux-3.10.19-vs2.3.6.8/security/selinux/hooks.c
---- linux-3.10.19/security/selinux/hooks.c 2013-07-14 17:01:42.000000000 +0000
-+++ linux-3.10.19-vs2.3.6.8/security/selinux/hooks.c 2013-08-22 20:30:00.000000000 +0000
+diff -NurpP --minimal linux-3.10.21/security/selinux/hooks.c linux-3.10.21-vs2.3.6.8/security/selinux/hooks.c
+--- linux-3.10.21/security/selinux/hooks.c 2013-07-14 17:01:42.000000000 +0000
++++ linux-3.10.21-vs2.3.6.8/security/selinux/hooks.c 2013-08-22 20:30:00.000000000 +0000
@@ -67,7 +67,6 @@
#include <linux/dccp.h>
#include <linux/quota.h>