[packages/kernel] - up to 3.5.2

arekm arekm at pld-linux.org
Wed Aug 15 19:11:17 CEST 2012


commit 07a627a5b5d9a4861169beb313c3d7c7c1d7bf7f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Aug 15 19:11:09 2012 +0200

    - up to 3.5.2

 kernel-vserver-2.3.patch | 2532 ++++++++++++++++++++++------------------------
 kernel.spec              |    6 +-
 2 files changed, 1233 insertions(+), 1305 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b0c663e..3a2dfb2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
 
 %define		rel		1
 %define		basever		3.5
-%define		postver		.1
+%define		postver		.2
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -134,7 +134,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	24153eaaa81dedc9481ada8cd9c3b83d
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:	d51e8baabbb781855f909f9dc1d00598
+# Patch0-md5:	128f05bf03ba7e772286b2066eab439c
 %endif
 
 Source3:	kernel-autoconf.h
@@ -212,7 +212,7 @@ Patch59:	kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	kernel-hostap.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-3.5-vs2.3.4.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.5.1-vs2.3.4.1.diff
 Patch100:	kernel-vserver-2.3.patch
 Patch101:	kernel-vserver-fixes.patch
 
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 070b105..18562b8 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.5/Documentation/vserver/debug.txt linux-3.5-vs2.3.4/Documentation/vserver/debug.txt
---- linux-3.5/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/Documentation/vserver/debug.txt	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/Documentation/vserver/debug.txt linux-3.5.1-vs2.3.4.1/Documentation/vserver/debug.txt
+--- linux-3.5.1/Documentation/vserver/debug.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/Documentation/vserver/debug.txt	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -156,9 +156,9 @@ diff -NurpP --minimal linux-3.5/Documentation/vserver/debug.txt linux-3.5-vs2.3.
 + 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.5/arch/alpha/Kconfig linux-3.5-vs2.3.4/arch/alpha/Kconfig
---- linux-3.5/arch/alpha/Kconfig	2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/alpha/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/alpha/Kconfig linux-3.5.1-vs2.3.4.1/arch/alpha/Kconfig
+--- linux-3.5.1/arch/alpha/Kconfig	2012-07-22 23:38:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/alpha/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -661,6 +661,8 @@ config DUMMY_CONSOLE
  	depends on VGA_HOSE
  	default y
@@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.5/arch/alpha/Kconfig linux-3.5-vs2.3.4/arch/alpha/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/alpha/kernel/entry.S linux-3.5-vs2.3.4/arch/alpha/kernel/entry.S
---- linux-3.5/arch/alpha/kernel/entry.S	2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/alpha/kernel/entry.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/alpha/kernel/entry.S linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/entry.S
+--- linux-3.5.1/arch/alpha/kernel/entry.S	2010-10-21 13:06:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/entry.S	2012-07-23 01:45:55.000000000 +0200
 @@ -860,24 +860,15 @@ sys_getxgid:
  	.globl	sys_getxpid
  	.ent	sys_getxpid
@@ -203,9 +203,9 @@ diff -NurpP --minimal linux-3.5/arch/alpha/kernel/entry.S linux-3.5-vs2.3.4/arch
  	ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-3.5/arch/alpha/kernel/ptrace.c linux-3.5-vs2.3.4/arch/alpha/kernel/ptrace.c
---- linux-3.5/arch/alpha/kernel/ptrace.c	2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/alpha/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/alpha/kernel/ptrace.c linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/ptrace.c
+--- linux-3.5.1/arch/alpha/kernel/ptrace.c	2012-05-21 18:06:12.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -214,9 +214,9 @@ diff -NurpP --minimal linux-3.5/arch/alpha/kernel/ptrace.c linux-3.5-vs2.3.4/arc
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.5/arch/alpha/kernel/systbls.S linux-3.5-vs2.3.4/arch/alpha/kernel/systbls.S
---- linux-3.5/arch/alpha/kernel/systbls.S	2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/alpha/kernel/systbls.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/alpha/kernel/systbls.S linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/systbls.S
+--- linux-3.5.1/arch/alpha/kernel/systbls.S	2012-07-22 23:38:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/systbls.S	2012-07-23 01:45:55.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
  	.quad sys_stat64			/* 425 */
  	.quad sys_lstat64
@@ -226,9 +226,9 @@ diff -NurpP --minimal linux-3.5/arch/alpha/kernel/systbls.S linux-3.5-vs2.3.4/ar
  	.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.5/arch/alpha/kernel/traps.c linux-3.5-vs2.3.4/arch/alpha/kernel/traps.c
---- linux-3.5/arch/alpha/kernel/traps.c	2012-05-21 18:06:12.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/alpha/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/alpha/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/traps.c
+--- linux-3.5.1/arch/alpha/kernel/traps.c	2012-05-21 18:06:12.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/alpha/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
  	printk("CPU %d ", hard_smp_processor_id());
@@ -239,9 +239,9 @@ diff -NurpP --minimal linux-3.5/arch/alpha/kernel/traps.c linux-3.5-vs2.3.4/arch
  	dik_show_regs(regs, r9_15);
  	add_taint(TAINT_DIE);
  	dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.5/arch/arm/Kconfig linux-3.5-vs2.3.4/arch/arm/Kconfig
---- linux-3.5/arch/arm/Kconfig	2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/arm/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/arm/Kconfig linux-3.5.1-vs2.3.4.1/arch/arm/Kconfig
+--- linux-3.5.1/arch/arm/Kconfig	2012-07-22 23:38:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/arm/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -2269,6 +2269,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -251,9 +251,9 @@ diff -NurpP --minimal linux-3.5/arch/arm/Kconfig linux-3.5-vs2.3.4/arch/arm/Kcon
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/arm/kernel/calls.S linux-3.5-vs2.3.4/arch/arm/kernel/calls.S
---- linux-3.5/arch/arm/kernel/calls.S	2012-01-09 16:13:54.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/arm/kernel/calls.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/arm/kernel/calls.S linux-3.5.1-vs2.3.4.1/arch/arm/kernel/calls.S
+--- linux-3.5.1/arch/arm/kernel/calls.S	2012-01-09 16:13:54.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/arm/kernel/calls.S	2012-07-23 01:45:55.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */	CALL(sys_request_key)
  		CALL(sys_keyctl)
@@ -263,9 +263,9 @@ diff -NurpP --minimal linux-3.5/arch/arm/kernel/calls.S linux-3.5-vs2.3.4/arch/a
  		CALL(sys_ioprio_set)
  /* 315 */	CALL(sys_ioprio_get)
  		CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.5/arch/arm/kernel/process.c linux-3.5-vs2.3.4/arch/arm/kernel/process.c
---- linux-3.5/arch/arm/kernel/process.c	2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/arm/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/arm/kernel/process.c linux-3.5.1-vs2.3.4.1/arch/arm/kernel/process.c
+--- linux-3.5.1/arch/arm/kernel/process.c	2012-07-22 23:38:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/arm/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
 @@ -335,7 +335,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -276,9 +276,9 @@ diff -NurpP --minimal linux-3.5/arch/arm/kernel/process.c linux-3.5-vs2.3.4/arch
  	__show_regs(regs);
  	dump_stack();
  }
-diff -NurpP --minimal linux-3.5/arch/arm/kernel/traps.c linux-3.5-vs2.3.4/arch/arm/kernel/traps.c
---- linux-3.5/arch/arm/kernel/traps.c	2012-07-22 23:38:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/arm/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/arm/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/arm/kernel/traps.c
+--- linux-3.5.1/arch/arm/kernel/traps.c	2012-07-22 23:38:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/arm/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -249,8 +249,8 @@ static int __die(const char *str, int er
  
  	print_modules();
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-3.5/arch/arm/kernel/traps.c linux-3.5-vs2.3.4/arch/a
  
  	if (!user_mode(regs) || in_interrupt()) {
  		dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.5/arch/cris/Kconfig linux-3.5-vs2.3.4/arch/cris/Kconfig
---- linux-3.5/arch/cris/Kconfig	2012-07-22 23:38:50.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/cris/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/cris/Kconfig linux-3.5.1-vs2.3.4.1/arch/cris/Kconfig
+--- linux-3.5.1/arch/cris/Kconfig	2012-07-22 23:38:50.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/cris/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -672,6 +672,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -302,9 +302,9 @@ diff -NurpP --minimal linux-3.5/arch/cris/Kconfig linux-3.5-vs2.3.4/arch/cris/Kc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/frv/kernel/kernel_thread.S linux-3.5-vs2.3.4/arch/frv/kernel/kernel_thread.S
---- linux-3.5/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/frv/kernel/kernel_thread.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/frv/kernel/kernel_thread.S linux-3.5.1-vs2.3.4.1/arch/frv/kernel/kernel_thread.S
+--- linux-3.5.1/arch/frv/kernel/kernel_thread.S	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/frv/kernel/kernel_thread.S	2012-07-23 01:45:55.000000000 +0200
 @@ -37,7 +37,7 @@ kernel_thread:
  
  	# start by forking the current process, but with shared VM
@@ -314,9 +314,9 @@ diff -NurpP --minimal linux-3.5/arch/frv/kernel/kernel_thread.S linux-3.5-vs2.3.
  	sethi.p		#0xe4e4,gr9		; second syscall arg	[newsp]
  	setlo		#0xe4e4,gr9
  	setlos.p	#0,gr10			; third syscall arg	[parent_tidptr]
-diff -NurpP --minimal linux-3.5/arch/h8300/Kconfig linux-3.5-vs2.3.4/arch/h8300/Kconfig
---- linux-3.5/arch/h8300/Kconfig	2012-03-19 19:46:39.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/h8300/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/h8300/Kconfig linux-3.5.1-vs2.3.4.1/arch/h8300/Kconfig
+--- linux-3.5.1/arch/h8300/Kconfig	2012-03-19 19:46:39.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/h8300/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -214,6 +214,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -326,9 +326,9 @@ diff -NurpP --minimal linux-3.5/arch/h8300/Kconfig linux-3.5-vs2.3.4/arch/h8300/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/ia64/Kconfig linux-3.5-vs2.3.4/arch/ia64/Kconfig
---- linux-3.5/arch/ia64/Kconfig	2012-07-22 23:38:50.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/ia64/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/ia64/Kconfig linux-3.5.1-vs2.3.4.1/arch/ia64/Kconfig
+--- linux-3.5.1/arch/ia64/Kconfig	2012-07-22 23:38:50.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/ia64/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -653,6 +653,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
@@ -338,9 +338,9 @@ diff -NurpP --minimal linux-3.5/arch/ia64/Kconfig linux-3.5-vs2.3.4/arch/ia64/Kc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/ia64/kernel/entry.S linux-3.5-vs2.3.4/arch/ia64/kernel/entry.S
---- linux-3.5/arch/ia64/kernel/entry.S	2012-03-19 19:46:40.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/ia64/kernel/entry.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/ia64/kernel/entry.S linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/entry.S
+--- linux-3.5.1/arch/ia64/kernel/entry.S	2012-03-19 19:46:40.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/entry.S	2012-07-23 01:45:55.000000000 +0200
 @@ -1714,7 +1714,7 @@ sys_call_table:
  	data8 sys_mq_notify
  	data8 sys_mq_getsetattr
@@ -350,9 +350,9 @@ diff -NurpP --minimal linux-3.5/arch/ia64/kernel/entry.S linux-3.5-vs2.3.4/arch/
  	data8 sys_waitid			// 1270
  	data8 sys_add_key
  	data8 sys_request_key
-diff -NurpP --minimal linux-3.5/arch/ia64/kernel/process.c linux-3.5-vs2.3.4/arch/ia64/kernel/process.c
---- linux-3.5/arch/ia64/kernel/process.c	2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/ia64/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/ia64/kernel/process.c linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/process.c
+--- linux-3.5.1/arch/ia64/kernel/process.c	2012-07-22 23:38:51.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
 @@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
  	unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -364,9 +364,9 @@ diff -NurpP --minimal linux-3.5/arch/ia64/kernel/process.c linux-3.5-vs2.3.4/arc
  	printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
  	       regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
  	       init_utsname()->release);
-diff -NurpP --minimal linux-3.5/arch/ia64/kernel/ptrace.c linux-3.5-vs2.3.4/arch/ia64/kernel/ptrace.c
---- linux-3.5/arch/ia64/kernel/ptrace.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/ia64/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/ia64/kernel/ptrace.c linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/ptrace.c
+--- linux-3.5.1/arch/ia64/kernel/ptrace.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -375,9 +375,9 @@ diff -NurpP --minimal linux-3.5/arch/ia64/kernel/ptrace.c linux-3.5-vs2.3.4/arch
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.5/arch/ia64/kernel/traps.c linux-3.5-vs2.3.4/arch/ia64/kernel/traps.c
---- linux-3.5/arch/ia64/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/ia64/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/ia64/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/traps.c
+--- linux-3.5.1/arch/ia64/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/ia64/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
  	put_cpu();
  
@@ -402,9 +402,9 @@ diff -NurpP --minimal linux-3.5/arch/ia64/kernel/traps.c linux-3.5-vs2.3.4/arch/
  			}
  		}
  	}
-diff -NurpP --minimal linux-3.5/arch/m32r/kernel/traps.c linux-3.5-vs2.3.4/arch/m32r/kernel/traps.c
---- linux-3.5/arch/m32r/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/m32r/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/m32r/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/m32r/kernel/traps.c
+--- linux-3.5.1/arch/m32r/kernel/traps.c	2012-05-21 18:06:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/m32r/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -195,8 +195,9 @@ static void show_registers(struct pt_reg
  	} else {
  		printk("SPI: %08lx\n", sp);
@@ -417,9 +417,9 @@ diff -NurpP --minimal linux-3.5/arch/m32r/kernel/traps.c linux-3.5-vs2.3.4/arch/
  
  	/*
  	 * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.5/arch/m68k/Kconfig linux-3.5-vs2.3.4/arch/m68k/Kconfig
---- linux-3.5/arch/m68k/Kconfig	2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/m68k/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/m68k/Kconfig linux-3.5.1-vs2.3.4.1/arch/m68k/Kconfig
+--- linux-3.5.1/arch/m68k/Kconfig	2012-07-22 23:38:51.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/m68k/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -139,6 +139,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
@@ -429,9 +429,9 @@ diff -NurpP --minimal linux-3.5/arch/m68k/Kconfig linux-3.5-vs2.3.4/arch/m68k/Kc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/mips/Kconfig linux-3.5-vs2.3.4/arch/mips/Kconfig
---- linux-3.5/arch/mips/Kconfig	2012-07-22 23:38:51.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/mips/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/Kconfig linux-3.5.1-vs2.3.4.1/arch/mips/Kconfig
+--- linux-3.5.1/arch/mips/Kconfig	2012-07-22 23:38:51.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/mips/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -2513,6 +2513,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
@@ -441,9 +441,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/Kconfig linux-3.5-vs2.3.4/arch/mips/Kc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/mips/kernel/ptrace.c linux-3.5-vs2.3.4/arch/mips/kernel/ptrace.c
---- linux-3.5/arch/mips/kernel/ptrace.c	2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/ptrace.c linux-3.5.1-vs2.3.4.1/arch/mips/kernel/ptrace.c
+--- linux-3.5.1/arch/mips/kernel/ptrace.c	2012-07-22 23:38:52.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -462,9 +462,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/ptrace.c linux-3.5-vs2.3.4/arch
  	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.5/arch/mips/kernel/scall32-o32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall32-o32.S
---- linux-3.5/arch/mips/kernel/scall32-o32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/scall32-o32.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/scall32-o32.S linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall32-o32.S
+--- linux-3.5.1/arch/mips/kernel/scall32-o32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall32-o32.S	2012-07-23 01:45:55.000000000 +0200
 @@ -523,7 +523,7 @@ einval:	li	v0, -ENOSYS
  	sys	sys_mq_timedreceive	5
  	sys	sys_mq_notify		2	/* 4275 */
@@ -474,9 +474,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall32-o32.S linux-3.5-vs2.3.4
  	sys	sys_waitid		5
  	sys	sys_ni_syscall		0	/* available, was setaltroot */
  	sys	sys_add_key		5	/* 4280 */
-diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-64.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-64.S
---- linux-3.5/arch/mips/kernel/scall64-64.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-64.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/scall64-64.S linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-64.S
+--- linux-3.5.1/arch/mips/kernel/scall64-64.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-64.S	2012-07-23 01:45:55.000000000 +0200
 @@ -362,7 +362,7 @@ sys_call_table:
  	PTR	sys_mq_timedreceive
  	PTR	sys_mq_notify
@@ -486,9 +486,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-64.S linux-3.5-vs2.3.4/
  	PTR	sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-n32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-n32.S
---- linux-3.5/arch/mips/kernel/scall64-n32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-n32.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/scall64-n32.S linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-n32.S
+--- linux-3.5.1/arch/mips/kernel/scall64-n32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-n32.S	2012-07-23 01:45:55.000000000 +0200
 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify
@@ -498,9 +498,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-n32.S linux-3.5-vs2.3.4
  	PTR	compat_sys_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key
-diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-o32.S linux-3.5-vs2.3.4/arch/mips/kernel/scall64-o32.S
---- linux-3.5/arch/mips/kernel/scall64-o32.S	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/scall64-o32.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/scall64-o32.S linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-o32.S
+--- linux-3.5.1/arch/mips/kernel/scall64-o32.S	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/scall64-o32.S	2012-07-23 01:45:55.000000000 +0200
 @@ -480,7 +480,7 @@ sys_call_table:
  	PTR	compat_sys_mq_timedreceive
  	PTR	compat_sys_mq_notify		/* 4275 */
@@ -510,9 +510,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/scall64-o32.S linux-3.5-vs2.3.4
  	PTR	sys_32_waitid
  	PTR	sys_ni_syscall			/* available, was setaltroot */
  	PTR	sys_add_key			/* 4280 */
-diff -NurpP --minimal linux-3.5/arch/mips/kernel/traps.c linux-3.5-vs2.3.4/arch/mips/kernel/traps.c
---- linux-3.5/arch/mips/kernel/traps.c	2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/mips/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/mips/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/mips/kernel/traps.c
+--- linux-3.5.1/arch/mips/kernel/traps.c	2012-07-22 23:38:52.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/mips/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs
  
  	__show_regs(regs);
@@ -527,9 +527,9 @@ diff -NurpP --minimal linux-3.5/arch/mips/kernel/traps.c linux-3.5-vs2.3.4/arch/
  	if (cpu_has_userlocal) {
  		unsigned long tls;
  
-diff -NurpP --minimal linux-3.5/arch/parisc/Kconfig linux-3.5-vs2.3.4/arch/parisc/Kconfig
---- linux-3.5/arch/parisc/Kconfig	2012-07-22 23:38:52.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/parisc/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/parisc/Kconfig linux-3.5.1-vs2.3.4.1/arch/parisc/Kconfig
+--- linux-3.5.1/arch/parisc/Kconfig	2012-07-22 23:38:52.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/parisc/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -281,6 +281,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
@@ -539,9 +539,9 @@ diff -NurpP --minimal linux-3.5/arch/parisc/Kconfig linux-3.5-vs2.3.4/arch/paris
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/parisc/kernel/syscall_table.S linux-3.5-vs2.3.4/arch/parisc/kernel/syscall_table.S
---- linux-3.5/arch/parisc/kernel/syscall_table.S	2011-10-24 18:45:00.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/parisc/kernel/syscall_table.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/parisc/kernel/syscall_table.S linux-3.5.1-vs2.3.4.1/arch/parisc/kernel/syscall_table.S
+--- linux-3.5.1/arch/parisc/kernel/syscall_table.S	2011-10-24 18:45:00.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/parisc/kernel/syscall_table.S	2012-07-23 01:45:55.000000000 +0200
 @@ -361,7 +361,7 @@
  	ENTRY_COMP(mbind)		/* 260 */
  	ENTRY_COMP(get_mempolicy)
@@ -551,9 +551,9 @@ diff -NurpP --minimal linux-3.5/arch/parisc/kernel/syscall_table.S linux-3.5-vs2
  	ENTRY_SAME(add_key)
  	ENTRY_SAME(request_key)		/* 265 */
  	ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.5/arch/parisc/kernel/traps.c linux-3.5-vs2.3.4/arch/parisc/kernel/traps.c
---- linux-3.5/arch/parisc/kernel/traps.c	2012-05-21 18:06:28.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/parisc/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/parisc/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/parisc/kernel/traps.c
+--- linux-3.5.1/arch/parisc/kernel/traps.c	2012-05-21 18:06:28.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/parisc/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_
  		if (err == 0)
  			return; /* STFU */
@@ -577,9 +577,9 @@ diff -NurpP --minimal linux-3.5/arch/parisc/kernel/traps.c linux-3.5-vs2.3.4/arc
  
  	/* Wot's wrong wif bein' racy? */
  	if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.5/arch/parisc/mm/fault.c linux-3.5-vs2.3.4/arch/parisc/mm/fault.c
---- linux-3.5/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/parisc/mm/fault.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/parisc/mm/fault.c linux-3.5.1-vs2.3.4.1/arch/parisc/mm/fault.c
+--- linux-3.5.1/arch/parisc/mm/fault.c	2010-08-02 16:52:06.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/parisc/mm/fault.c	2012-07-23 01:45:55.000000000 +0200
 @@ -237,8 +237,9 @@ bad_area:
  
  #ifdef PRINT_USER_FAULTS
@@ -592,9 +592,9 @@ diff -NurpP --minimal linux-3.5/arch/parisc/mm/fault.c linux-3.5-vs2.3.4/arch/pa
  		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.5/arch/powerpc/Kconfig linux-3.5-vs2.3.4/arch/powerpc/Kconfig
---- linux-3.5/arch/powerpc/Kconfig	2012-07-22 23:38:53.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/powerpc/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/powerpc/Kconfig linux-3.5.1-vs2.3.4.1/arch/powerpc/Kconfig
+--- linux-3.5.1/arch/powerpc/Kconfig	2012-07-22 23:38:53.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/powerpc/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -994,6 +994,8 @@ source "lib/Kconfig"
  
  source "arch/powerpc/Kconfig.debug"
@@ -604,9 +604,9 @@ diff -NurpP --minimal linux-3.5/arch/powerpc/Kconfig linux-3.5-vs2.3.4/arch/powe
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-3.5/arch/powerpc/include/asm/unistd.h linux-3.5-vs2.3.4/arch/powerpc/include/asm/unistd.h
---- linux-3.5/arch/powerpc/include/asm/unistd.h	2012-01-09 16:14:05.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/powerpc/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/powerpc/include/asm/unistd.h linux-3.5.1-vs2.3.4.1/arch/powerpc/include/asm/unistd.h
+--- linux-3.5.1/arch/powerpc/include/asm/unistd.h	2012-01-09 16:14:05.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/powerpc/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -275,7 +275,7 @@
  #endif
  #define __NR_rtas		255
@@ -616,9 +616,9 @@ diff -NurpP --minimal linux-3.5/arch/powerpc/include/asm/unistd.h linux-3.5-vs2.
  #define __NR_migrate_pages	258
  #define __NR_mbind		259
  #define __NR_get_mempolicy	260
-diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/process.c linux-3.5-vs2.3.4/arch/powerpc/kernel/process.c
---- linux-3.5/arch/powerpc/kernel/process.c	2012-07-22 23:38:58.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/powerpc/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/powerpc/kernel/process.c linux-3.5.1-vs2.3.4.1/arch/powerpc/kernel/process.c
+--- linux-3.5.1/arch/powerpc/kernel/process.c	2012-07-22 23:38:58.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/powerpc/kernel/process.c	2012-07-23 01:45:55.000000000 +0200
 @@ -661,8 +661,9 @@ void show_regs(struct pt_regs * regs)
  #else
  		printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -631,9 +631,9 @@ diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/process.c linux-3.5-vs2.3.4/
  
  #ifdef CONFIG_SMP
  	printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/traps.c linux-3.5-vs2.3.4/arch/powerpc/kernel/traps.c
---- linux-3.5/arch/powerpc/kernel/traps.c	2012-05-21 18:06:30.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/powerpc/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/powerpc/kernel/traps.c linux-3.5.1-vs2.3.4.1/arch/powerpc/kernel/traps.c
+--- linux-3.5.1/arch/powerpc/kernel/traps.c	2012-05-21 18:06:30.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/powerpc/kernel/traps.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1118,8 +1118,9 @@ void nonrecoverable_exception(struct pt_
  
  void trace_syscall(struct pt_regs *regs)
@@ -646,9 +646,9 @@ diff -NurpP --minimal linux-3.5/arch/powerpc/kernel/traps.c linux-3.5-vs2.3.4/ar
  	       regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
  }
  
-diff -NurpP --minimal linux-3.5/arch/s390/Kconfig linux-3.5-vs2.3.4/arch/s390/Kconfig
---- linux-3.5/arch/s390/Kconfig	2012-07-22 23:38:58.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/s390/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/s390/Kconfig linux-3.5.1-vs2.3.4.1/arch/s390/Kconfig
+--- linux-3.5.1/arch/s390/Kconfig	2012-07-22 23:38:58.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/s390/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -630,6 +630,8 @@ source "fs/Kconfig"
  
  source "arch/s390/Kconfig.debug"
@@ -658,9 +658,9 @@ diff -NurpP --minimal linux-3.5/arch/s390/Kconfig linux-3.5-vs2.3.4/arch/s390/Kc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/s390/include/asm/tlb.h linux-3.5-vs2.3.4/arch/s390/include/asm/tlb.h
---- linux-3.5/arch/s390/include/asm/tlb.h	2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/s390/include/asm/tlb.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/s390/include/asm/tlb.h linux-3.5.1-vs2.3.4.1/arch/s390/include/asm/tlb.h
+--- linux-3.5.1/arch/s390/include/asm/tlb.h	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/s390/include/asm/tlb.h	2012-07-23 01:45:55.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -669,9 +669,9 @@ diff -NurpP --minimal linux-3.5/arch/s390/include/asm/tlb.h linux-3.5-vs2.3.4/ar
  #include <asm/processor.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.5/arch/s390/include/asm/unistd.h linux-3.5-vs2.3.4/arch/s390/include/asm/unistd.h
---- linux-3.5/arch/s390/include/asm/unistd.h	2012-03-19 19:46:48.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/s390/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/s390/include/asm/unistd.h linux-3.5.1-vs2.3.4.1/arch/s390/include/asm/unistd.h
+--- linux-3.5.1/arch/s390/include/asm/unistd.h	2012-03-19 19:46:48.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/s390/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -202,7 +202,7 @@
  #define __NR_clock_gettime	(__NR_timer_create+6)
  #define __NR_clock_getres	(__NR_timer_create+7)
@@ -681,9 +681,9 @@ diff -NurpP --minimal linux-3.5/arch/s390/include/asm/unistd.h linux-3.5-vs2.3.4
  #define __NR_statfs64		265
  #define __NR_fstatfs64		266
  #define __NR_remap_file_pages	267
-diff -NurpP --minimal linux-3.5/arch/s390/kernel/ptrace.c linux-3.5-vs2.3.4/arch/s390/kernel/ptrace.c
---- linux-3.5/arch/s390/kernel/ptrace.c	2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/s390/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/s390/kernel/ptrace.c linux-3.5.1-vs2.3.4.1/arch/s390/kernel/ptrace.c
+--- linux-3.5.1/arch/s390/kernel/ptrace.c	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/s390/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/tracehook.h>
  #include <linux/seccomp.h>
@@ -692,9 +692,9 @@ diff -NurpP --minimal linux-3.5/arch/s390/kernel/ptrace.c linux-3.5-vs2.3.4/arch
  #include <trace/syscall.h>
  #include <asm/segment.h>
  #include <asm/page.h>
-diff -NurpP --minimal linux-3.5/arch/s390/kernel/syscalls.S linux-3.5-vs2.3.4/arch/s390/kernel/syscalls.S
---- linux-3.5/arch/s390/kernel/syscalls.S	2012-01-09 16:14:06.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/s390/kernel/syscalls.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/s390/kernel/syscalls.S linux-3.5.1-vs2.3.4.1/arch/s390/kernel/syscalls.S
+--- linux-3.5.1/arch/s390/kernel/syscalls.S	2012-01-09 16:14:06.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/s390/kernel/syscalls.S	2012-07-23 01:45:55.000000000 +0200
 @@ -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)
@@ -704,9 +704,9 @@ diff -NurpP --minimal linux-3.5/arch/s390/kernel/syscalls.S linux-3.5-vs2.3.4/ar
  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.5/arch/sh/Kconfig linux-3.5-vs2.3.4/arch/sh/Kconfig
---- linux-3.5/arch/sh/Kconfig	2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/sh/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sh/Kconfig linux-3.5.1-vs2.3.4.1/arch/sh/Kconfig
+--- linux-3.5.1/arch/sh/Kconfig	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/sh/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -937,6 +937,8 @@ source "fs/Kconfig"
  
  source "arch/sh/Kconfig.debug"
@@ -716,9 +716,9 @@ diff -NurpP --minimal linux-3.5/arch/sh/Kconfig linux-3.5-vs2.3.4/arch/sh/Kconfi
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/sh/kernel/irq.c linux-3.5-vs2.3.4/arch/sh/kernel/irq.c
---- linux-3.5/arch/sh/kernel/irq.c	2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/sh/kernel/irq.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sh/kernel/irq.c linux-3.5.1-vs2.3.4.1/arch/sh/kernel/irq.c
+--- linux-3.5.1/arch/sh/kernel/irq.c	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/sh/kernel/irq.c	2012-07-23 01:45:55.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/ftrace.h>
  #include <linux/delay.h>
@@ -727,9 +727,9 @@ diff -NurpP --minimal linux-3.5/arch/sh/kernel/irq.c linux-3.5-vs2.3.4/arch/sh/k
  #include <asm/processor.h>
  #include <asm/machvec.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.5/arch/sparc/Kconfig linux-3.5-vs2.3.4/arch/sparc/Kconfig
---- linux-3.5/arch/sparc/Kconfig	2012-07-22 23:38:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/sparc/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sparc/Kconfig linux-3.5.1-vs2.3.4.1/arch/sparc/Kconfig
+--- linux-3.5.1/arch/sparc/Kconfig	2012-07-22 23:38:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/sparc/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -592,6 +592,8 @@ source "fs/Kconfig"
  
  source "arch/sparc/Kconfig.debug"
@@ -739,9 +739,9 @@ diff -NurpP --minimal linux-3.5/arch/sparc/Kconfig linux-3.5-vs2.3.4/arch/sparc/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/sparc/include/asm/unistd.h linux-3.5-vs2.3.4/arch/sparc/include/asm/unistd.h
---- linux-3.5/arch/sparc/include/asm/unistd.h	2012-01-09 16:14:07.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/sparc/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sparc/include/asm/unistd.h linux-3.5.1-vs2.3.4.1/arch/sparc/include/asm/unistd.h
+--- linux-3.5.1/arch/sparc/include/asm/unistd.h	2012-01-09 16:14:07.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/sparc/include/asm/unistd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -335,7 +335,7 @@
  #define __NR_timer_getoverrun	264
  #define __NR_timer_delete	265
@@ -751,9 +751,9 @@ diff -NurpP --minimal linux-3.5/arch/sparc/include/asm/unistd.h linux-3.5-vs2.3.
  #define __NR_io_setup		268
  #define __NR_io_destroy		269
  #define __NR_io_submit		270
-diff -NurpP --minimal linux-3.5/arch/sparc/kernel/systbls_32.S linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_32.S
---- linux-3.5/arch/sparc/kernel/systbls_32.S	2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_32.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sparc/kernel/systbls_32.S linux-3.5.1-vs2.3.4.1/arch/sparc/kernel/systbls_32.S
+--- linux-3.5.1/arch/sparc/kernel/systbls_32.S	2012-01-09 16:14:09.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/sparc/kernel/systbls_32.S	2012-07-23 01:45:55.000000000 +0200
 @@ -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
@@ -763,9 +763,9 @@ diff -NurpP --minimal linux-3.5/arch/sparc/kernel/systbls_32.S linux-3.5-vs2.3.4
  /*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.5/arch/sparc/kernel/systbls_64.S linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_64.S
---- linux-3.5/arch/sparc/kernel/systbls_64.S	2012-07-22 23:39:00.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/sparc/kernel/systbls_64.S	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/sparc/kernel/systbls_64.S linux-3.5.1-vs2.3.4.1/arch/sparc/kernel/systbls_64.S
+--- linux-3.5.1/arch/sparc/kernel/systbls_64.S	2012-07-22 23:39:00.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/sparc/kernel/systbls_64.S	2012-07-23 01:45:55.000000000 +0200
 @@ -71,7 +71,7 @@ sys_call_table32:
  /*250*/	.word sys_mremap, compat_sys_sysctl, sys32_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
@@ -784,9 +784,9 @@ diff -NurpP --minimal linux-3.5/arch/sparc/kernel/systbls_64.S linux-3.5-vs2.3.4
  /*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.5/arch/um/Kconfig.rest linux-3.5-vs2.3.4/arch/um/Kconfig.rest
---- linux-3.5/arch/um/Kconfig.rest	2012-01-09 16:14:09.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/um/Kconfig.rest	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/um/Kconfig.rest linux-3.5.1-vs2.3.4.1/arch/um/Kconfig.rest
+--- linux-3.5.1/arch/um/Kconfig.rest	2012-01-09 16:14:09.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/um/Kconfig.rest	2012-07-23 01:45:55.000000000 +0200
 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net"
  
  source "fs/Kconfig"
@@ -796,14 +796,14 @@ diff -NurpP --minimal linux-3.5/arch/um/Kconfig.rest linux-3.5-vs2.3.4/arch/um/K
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/um/include/shared/kern_constants.h linux-3.5-vs2.3.4/arch/um/include/shared/kern_constants.h
---- linux-3.5/arch/um/include/shared/kern_constants.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/um/include/shared/kern_constants.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/um/include/shared/kern_constants.h linux-3.5.1-vs2.3.4.1/arch/um/include/shared/kern_constants.h
+--- linux-3.5.1/arch/um/include/shared/kern_constants.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/um/include/shared/kern_constants.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1 @@
 +#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.5/arch/um/include/shared/user_constants.h linux-3.5-vs2.3.4/arch/um/include/shared/user_constants.h
---- linux-3.5/arch/um/include/shared/user_constants.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/arch/um/include/shared/user_constants.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/um/include/shared/user_constants.h linux-3.5.1-vs2.3.4.1/arch/um/include/shared/user_constants.h
+--- linux-3.5.1/arch/um/include/shared/user_constants.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/arch/um/include/shared/user_constants.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * DO NOT MODIFY.
@@ -845,9 +845,9 @@ diff -NurpP --minimal linux-3.5/arch/um/include/shared/user_constants.h linux-3.
 +#define UM_PROT_WRITE 2 /* PROT_WRITE	# */
 +#define UM_PROT_EXEC 4 /* PROT_EXEC	# */
 +
-diff -NurpP --minimal linux-3.5/arch/x86/Kconfig linux-3.5-vs2.3.4/arch/x86/Kconfig
---- linux-3.5/arch/x86/Kconfig	2012-07-22 23:39:01.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/x86/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/x86/Kconfig linux-3.5.1-vs2.3.4.1/arch/x86/Kconfig
+--- linux-3.5.1/arch/x86/Kconfig	2012-07-22 23:39:01.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/x86/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -2226,6 +2226,8 @@ source "fs/Kconfig"
  
  source "arch/x86/Kconfig.debug"
@@ -857,9 +857,9 @@ diff -NurpP --minimal linux-3.5/arch/x86/Kconfig linux-3.5-vs2.3.4/arch/x86/Kcon
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.5/arch/x86/syscalls/syscall_32.tbl linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_32.tbl
---- linux-3.5/arch/x86/syscalls/syscall_32.tbl	2012-07-22 23:39:02.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_32.tbl	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/x86/syscalls/syscall_32.tbl linux-3.5.1-vs2.3.4.1/arch/x86/syscalls/syscall_32.tbl
+--- linux-3.5.1/arch/x86/syscalls/syscall_32.tbl	2012-07-22 23:39:02.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/x86/syscalls/syscall_32.tbl	2012-07-23 01:45:55.000000000 +0200
 @@ -279,7 +279,7 @@
  270	i386	tgkill			sys_tgkill
  271	i386	utimes			sys_utimes			compat_sys_utimes
@@ -869,9 +869,9 @@ diff -NurpP --minimal linux-3.5/arch/x86/syscalls/syscall_32.tbl linux-3.5-vs2.3
  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.5/arch/x86/syscalls/syscall_64.tbl linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_64.tbl
---- linux-3.5/arch/x86/syscalls/syscall_64.tbl	2012-07-22 23:39:02.000000000 +0200
-+++ linux-3.5-vs2.3.4/arch/x86/syscalls/syscall_64.tbl	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/arch/x86/syscalls/syscall_64.tbl linux-3.5.1-vs2.3.4.1/arch/x86/syscalls/syscall_64.tbl
+--- linux-3.5.1/arch/x86/syscalls/syscall_64.tbl	2012-07-22 23:39:02.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/arch/x86/syscalls/syscall_64.tbl	2012-07-23 01:45:55.000000000 +0200
 @@ -242,7 +242,7 @@
  233	common	epoll_ctl		sys_epoll_ctl
  234	common	tgkill			sys_tgkill
@@ -881,9 +881,9 @@ diff -NurpP --minimal linux-3.5/arch/x86/syscalls/syscall_64.tbl linux-3.5-vs2.3
  237	common	mbind			sys_mbind
  238	common	set_mempolicy		sys_set_mempolicy
  239	common	get_mempolicy		sys_get_mempolicy
-diff -NurpP --minimal linux-3.5/drivers/block/Kconfig linux-3.5-vs2.3.4/drivers/block/Kconfig
---- linux-3.5/drivers/block/Kconfig	2012-05-21 18:06:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/block/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/block/Kconfig linux-3.5.1-vs2.3.4.1/drivers/block/Kconfig
+--- linux-3.5.1/drivers/block/Kconfig	2012-05-21 18:06:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/block/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -290,6 +290,13 @@ config BLK_DEV_CRYPTOLOOP
  
  source "drivers/block/drbd/Kconfig"
@@ -898,9 +898,9 @@ diff -NurpP --minimal linux-3.5/drivers/block/Kconfig linux-3.5-vs2.3.4/drivers/
  config BLK_DEV_NBD
  	tristate "Network block device support"
  	depends on NET
-diff -NurpP --minimal linux-3.5/drivers/block/Makefile linux-3.5-vs2.3.4/drivers/block/Makefile
---- linux-3.5/drivers/block/Makefile	2012-03-19 19:46:52.000000000 +0100
-+++ linux-3.5-vs2.3.4/drivers/block/Makefile	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/block/Makefile linux-3.5.1-vs2.3.4.1/drivers/block/Makefile
+--- linux-3.5.1/drivers/block/Makefile	2012-03-19 19:46:52.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/drivers/block/Makefile	2012-07-23 01:45:55.000000000 +0200
 @@ -35,6 +35,7 @@ obj-$(CONFIG_VIODASD)		+= viodasd.o
  obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
  obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
@@ -909,9 +909,9 @@ diff -NurpP --minimal linux-3.5/drivers/block/Makefile linux-3.5-vs2.3.4/drivers
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/
-diff -NurpP --minimal linux-3.5/drivers/block/loop.c linux-3.5-vs2.3.4/drivers/block/loop.c
---- linux-3.5/drivers/block/loop.c	2012-07-22 23:39:02.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/block/loop.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/block/loop.c linux-3.5.1-vs2.3.4.1/drivers/block/loop.c
+--- linux-3.5.1/drivers/block/loop.c	2012-07-22 23:39:02.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/block/loop.c	2012-07-23 01:45:55.000000000 +0200
 @@ -76,6 +76,7 @@
  #include <linux/sysfs.h>
  #include <linux/miscdevice.h>
@@ -967,9 +967,9 @@ diff -NurpP --minimal linux-3.5/drivers/block/loop.c linux-3.5-vs2.3.4/drivers/b
  	mutex_lock(&lo->lo_ctl_mutex);
  	lo->lo_refcnt++;
  	mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.5/drivers/block/vroot.c linux-3.5-vs2.3.4/drivers/block/vroot.c
---- linux-3.5/drivers/block/vroot.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/drivers/block/vroot.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/block/vroot.c linux-3.5.1-vs2.3.4.1/drivers/block/vroot.c
+--- linux-3.5.1/drivers/block/vroot.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/drivers/block/vroot.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,291 @@
 +/*
 + *  linux/drivers/block/vroot.c
@@ -1262,9 +1262,9 @@ diff -NurpP --minimal linux-3.5/drivers/block/vroot.c linux-3.5-vs2.3.4/drivers/
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.5/drivers/infiniband/Kconfig linux-3.5-vs2.3.4/drivers/infiniband/Kconfig
---- linux-3.5/drivers/infiniband/Kconfig	2012-07-22 23:39:06.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/infiniband/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/infiniband/Kconfig linux-3.5.1-vs2.3.4.1/drivers/infiniband/Kconfig
+--- linux-3.5.1/drivers/infiniband/Kconfig	2012-07-22 23:39:06.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/infiniband/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM
  config INFINIBAND_ADDR_TRANS
  	bool
@@ -1274,9 +1274,9 @@ diff -NurpP --minimal linux-3.5/drivers/infiniband/Kconfig linux-3.5-vs2.3.4/dri
  	default y
  
  source "drivers/infiniband/hw/mthca/Kconfig"
-diff -NurpP --minimal linux-3.5/drivers/infiniband/core/addr.c linux-3.5-vs2.3.4/drivers/infiniband/core/addr.c
---- linux-3.5/drivers/infiniband/core/addr.c	2012-05-21 18:06:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/infiniband/core/addr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/infiniband/core/addr.c linux-3.5.1-vs2.3.4.1/drivers/infiniband/core/addr.c
+--- linux-3.5.1/drivers/infiniband/core/addr.c	2012-05-21 18:06:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/infiniband/core/addr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -263,7 +263,7 @@ static int addr6_resolve(struct sockaddr
  
  	if (ipv6_addr_any(&fl6.saddr)) {
@@ -1286,9 +1286,9 @@ diff -NurpP --minimal linux-3.5/drivers/infiniband/core/addr.c linux-3.5-vs2.3.4
  		if (ret)
  			goto put;
  
-diff -NurpP --minimal linux-3.5/drivers/md/dm-ioctl.c linux-3.5-vs2.3.4/drivers/md/dm-ioctl.c
---- linux-3.5/drivers/md/dm-ioctl.c	2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/md/dm-ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/md/dm-ioctl.c linux-3.5.1-vs2.3.4.1/drivers/md/dm-ioctl.c
+--- linux-3.5.1/drivers/md/dm-ioctl.c	2012-05-21 18:06:49.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/md/dm-ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/dm-ioctl.h>
  #include <linux/hdreg.h>
@@ -1374,9 +1374,9 @@ diff -NurpP --minimal linux-3.5/drivers/md/dm-ioctl.c linux-3.5-vs2.3.4/drivers/
  		return -EACCES;
  
  	if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.5/drivers/md/dm.c linux-3.5-vs2.3.4/drivers/md/dm.c
---- linux-3.5/drivers/md/dm.c	2012-05-21 18:06:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/md/dm.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/md/dm.c linux-3.5.1-vs2.3.4.1/drivers/md/dm.c
+--- linux-3.5.1/drivers/md/dm.c	2012-05-21 18:06:49.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/md/dm.c	2012-07-23 01:45:55.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/idr.h>
  #include <linux/hdreg.h>
@@ -1450,9 +1450,9 @@ diff -NurpP --minimal linux-3.5/drivers/md/dm.c linux-3.5-vs2.3.4/drivers/md/dm.
  	md->queue = blk_alloc_queue(GFP_KERNEL);
  	if (!md->queue)
  		goto bad_queue;
-diff -NurpP --minimal linux-3.5/drivers/md/dm.h linux-3.5-vs2.3.4/drivers/md/dm.h
---- linux-3.5/drivers/md/dm.h	2012-01-09 16:14:21.000000000 +0100
-+++ linux-3.5-vs2.3.4/drivers/md/dm.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/md/dm.h linux-3.5.1-vs2.3.4.1/drivers/md/dm.h
+--- linux-3.5.1/drivers/md/dm.h	2012-01-09 16:14:21.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/drivers/md/dm.h	2012-07-23 01:45:55.000000000 +0200
 @@ -41,6 +41,8 @@ struct dm_dev_internal {
  struct dm_table;
  struct dm_md_mempools;
@@ -1462,9 +1462,9 @@ diff -NurpP --minimal linux-3.5/drivers/md/dm.h linux-3.5-vs2.3.4/drivers/md/dm.
  /*-----------------------------------------------------------------
   * Internal table functions.
   *---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/tun.c
---- linux-3.5/drivers/net/tun.c	2012-07-22 23:39:17.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/net/tun.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/net/tun.c linux-3.5.1-vs2.3.4.1/drivers/net/tun.c
+--- linux-3.5.1/drivers/net/tun.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/net/tun.c	2012-08-11 15:15:02.000000000 +0200
 @@ -64,6 +64,7 @@
  #include <linux/nsproxy.h>
  #include <linux/virtio_net.h>
@@ -1481,7 +1481,7 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  
  	struct net_device	*dev;
  	netdev_features_t	set_features;
-@@ -909,6 +911,7 @@ static void tun_setup(struct net_device 
+@@ -911,6 +913,7 @@ static void tun_setup(struct net_device 
  
  	tun->owner = -1;
  	tun->group = -1;
@@ -1489,7 +1489,7 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  
  	dev->ethtool_ops = &tun_ethtool_ops;
  	dev->destructor = tun_free_netdev;
-@@ -1067,7 +1070,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1069,7 +1072,7 @@ static int tun_set_iff(struct net *net, 
  
  		if (((tun->owner != -1 && cred->euid != tun->owner) ||
  		     (tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -1498,7 +1498,7 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  			return -EPERM;
  		err = security_tun_dev_attach(tun->socket.sk);
  		if (err < 0)
-@@ -1081,7 +1084,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1083,7 +1086,7 @@ static int tun_set_iff(struct net *net, 
  		char *name;
  		unsigned long flags = 0;
  
@@ -1507,7 +1507,7 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  			return -EPERM;
  		err = security_tun_dev_create();
  		if (err < 0)
-@@ -1150,6 +1153,9 @@ static int tun_set_iff(struct net *net, 
+@@ -1153,6 +1156,9 @@ static int tun_set_iff(struct net *net, 
  
  		sk->sk_destruct = tun_sock_destruct;
  
@@ -1517,7 +1517,7 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  		err = tun_attach(tun, file);
  		if (err < 0)
  			goto failed;
-@@ -1331,6 +1337,16 @@ static long __tun_chr_ioctl(struct file 
+@@ -1336,6 +1342,16 @@ static long __tun_chr_ioctl(struct file 
  		tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
  		break;
  
@@ -1534,9 +1534,9 @@ diff -NurpP --minimal linux-3.5/drivers/net/tun.c linux-3.5-vs2.3.4/drivers/net/
  	case TUNSETLINK:
  		/* Only allow setting the type when the interface is down */
  		if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.5/drivers/tty/sysrq.c linux-3.5-vs2.3.4/drivers/tty/sysrq.c
---- linux-3.5/drivers/tty/sysrq.c	2012-05-21 18:07:16.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/tty/sysrq.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/tty/sysrq.c linux-3.5.1-vs2.3.4.1/drivers/tty/sysrq.c
+--- linux-3.5.1/drivers/tty/sysrq.c	2012-05-21 18:07:16.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/tty/sysrq.c	2012-07-23 01:45:55.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/input.h>
@@ -1588,9 +1588,9 @@ diff -NurpP --minimal linux-3.5/drivers/tty/sysrq.c linux-3.5-vs2.3.4/drivers/tt
  	else
  		retval = -1;
  	return retval;
-diff -NurpP --minimal linux-3.5/drivers/tty/tty_io.c linux-3.5-vs2.3.4/drivers/tty/tty_io.c
---- linux-3.5/drivers/tty/tty_io.c	2012-07-22 23:39:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/drivers/tty/tty_io.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/drivers/tty/tty_io.c linux-3.5.1-vs2.3.4.1/drivers/tty/tty_io.c
+--- linux-3.5.1/drivers/tty/tty_io.c	2012-07-22 23:39:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/drivers/tty/tty_io.c	2012-07-23 01:45:55.000000000 +0200
 @@ -104,6 +104,7 @@
  
  #include <linux/kmod.h>
@@ -1617,9 +1617,9 @@ diff -NurpP --minimal linux-3.5/drivers/tty/tty_io.c linux-3.5-vs2.3.4/drivers/t
  	if (pgrp_nr < 0)
  		return -EINVAL;
  	rcu_read_lock();
-diff -NurpP --minimal linux-3.5/fs/attr.c linux-3.5-vs2.3.4/fs/attr.c
---- linux-3.5/fs/attr.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/attr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/attr.c linux-3.5.1-vs2.3.4.1/fs/attr.c
+--- linux-3.5.1/fs/attr.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/attr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -14,6 +14,9 @@
  #include <linux/fcntl.h>
  #include <linux/security.h>
@@ -1660,9 +1660,9 @@ diff -NurpP --minimal linux-3.5/fs/attr.c linux-3.5-vs2.3.4/fs/attr.c
  		if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  			return -EPERM;
  	}
-diff -NurpP --minimal linux-3.5/fs/block_dev.c linux-3.5-vs2.3.4/fs/block_dev.c
---- linux-3.5/fs/block_dev.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/block_dev.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/block_dev.c linux-3.5.1-vs2.3.4.1/fs/block_dev.c
+--- linux-3.5.1/fs/block_dev.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/block_dev.c	2012-07-23 01:45:55.000000000 +0200
 @@ -27,6 +27,7 @@
  #include <linux/namei.h>
  #include <linux/log2.h>
@@ -1700,9 +1700,9 @@ diff -NurpP --minimal linux-3.5/fs/block_dev.c linux-3.5-vs2.3.4/fs/block_dev.c
  	if (bdev) {
  		spin_lock(&bdev_lock);
  		if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.5/fs/btrfs/ctree.h linux-3.5-vs2.3.4/fs/btrfs/ctree.h
---- linux-3.5/fs/btrfs/ctree.h	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/btrfs/ctree.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/btrfs/ctree.h linux-3.5.1-vs2.3.4.1/fs/btrfs/ctree.h
+--- linux-3.5.1/fs/btrfs/ctree.h	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/btrfs/ctree.h	2012-07-23 01:45:55.000000000 +0200
 @@ -671,11 +671,14 @@ struct btrfs_inode_item {
  	/* modification sequence number for NFS */
  	__le64 sequence;
@@ -1755,9 +1755,9 @@ diff -NurpP --minimal linux-3.5/fs/btrfs/ctree.h linux-3.5-vs2.3.4/fs/btrfs/ctre
  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.5/fs/btrfs/disk-io.c linux-3.5-vs2.3.4/fs/btrfs/disk-io.c
---- linux-3.5/fs/btrfs/disk-io.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/btrfs/disk-io.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/btrfs/disk-io.c linux-3.5.1-vs2.3.4.1/fs/btrfs/disk-io.c
+--- linux-3.5.1/fs/btrfs/disk-io.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/btrfs/disk-io.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2090,6 +2090,9 @@ int open_ctree(struct super_block *sb,
  		goto fail_alloc;
  	}
@@ -1768,9 +1768,9 @@ diff -NurpP --minimal linux-3.5/fs/btrfs/disk-io.c linux-3.5-vs2.3.4/fs/btrfs/di
  	features = btrfs_super_incompat_flags(disk_super) &
  		~BTRFS_FEATURE_INCOMPAT_SUPP;
  	if (features) {
-diff -NurpP --minimal linux-3.5/fs/btrfs/inode.c linux-3.5-vs2.3.4/fs/btrfs/inode.c
---- linux-3.5/fs/btrfs/inode.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/btrfs/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/btrfs/inode.c linux-3.5.1-vs2.3.4.1/fs/btrfs/inode.c
+--- linux-3.5.1/fs/btrfs/inode.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/btrfs/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -39,6 +39,7 @@
  #include <linux/slab.h>
  #include <linux/ratelimit.h>
@@ -1835,9 +1835,9 @@ diff -NurpP --minimal linux-3.5/fs/btrfs/inode.c linux-3.5-vs2.3.4/fs/btrfs/inod
  	.get_acl	= btrfs_get_acl,
  };
  
-diff -NurpP --minimal linux-3.5/fs/btrfs/ioctl.c linux-3.5-vs2.3.4/fs/btrfs/ioctl.c
---- linux-3.5/fs/btrfs/ioctl.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/btrfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/btrfs/ioctl.c linux-3.5.1-vs2.3.4.1/fs/btrfs/ioctl.c
+--- linux-3.5.1/fs/btrfs/ioctl.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/btrfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -72,10 +72,13 @@ static unsigned int btrfs_flags_to_ioctl
  {
  	unsigned int iflags = 0;
@@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.5/fs/btrfs/ioctl.c linux-3.5-vs2.3.4/fs/btrfs/ioct
  	if (flags & FS_APPEND_FL)
  		ip->flags |= BTRFS_INODE_APPEND;
  	else
-diff -NurpP --minimal linux-3.5/fs/btrfs/super.c linux-3.5-vs2.3.4/fs/btrfs/super.c
---- linux-3.5/fs/btrfs/super.c	2012-07-22 23:39:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/btrfs/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/btrfs/super.c linux-3.5.1-vs2.3.4.1/fs/btrfs/super.c
+--- linux-3.5.1/fs/btrfs/super.c	2012-07-22 23:39:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/btrfs/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -281,7 +281,7 @@ enum {
  	Opt_no_space_cache, Opt_recovery, Opt_skip_balance,
  	Opt_check_integrity, Opt_check_integrity_including_extent_data,
@@ -2068,9 +2068,9 @@ diff -NurpP --minimal linux-3.5/fs/btrfs/super.c linux-3.5-vs2.3.4/fs/btrfs/supe
  	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
  		return 0;
  
-diff -NurpP --minimal linux-3.5/fs/char_dev.c linux-3.5-vs2.3.4/fs/char_dev.c
---- linux-3.5/fs/char_dev.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/char_dev.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/char_dev.c linux-3.5.1-vs2.3.4.1/fs/char_dev.c
+--- linux-3.5.1/fs/char_dev.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/char_dev.c	2012-07-23 01:45:55.000000000 +0200
 @@ -21,6 +21,8 @@
  #include <linux/mutex.h>
  #include <linux/backing-dev.h>
@@ -2103,9 +2103,9 @@ diff -NurpP --minimal linux-3.5/fs/char_dev.c linux-3.5-vs2.3.4/fs/char_dev.c
  		if (!kobj)
  			return -ENXIO;
  		new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.5/fs/dcache.c linux-3.5-vs2.3.4/fs/dcache.c
---- linux-3.5/fs/dcache.c	2012-07-22 23:39:36.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/dcache.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/dcache.c linux-3.5.1-vs2.3.4.1/fs/dcache.c
+--- linux-3.5.1/fs/dcache.c	2012-07-22 23:39:36.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/dcache.c	2012-07-23 01:45:55.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rculist_bl.h>
  #include <linux/prefetch.h>
@@ -2157,9 +2157,9 @@ diff -NurpP --minimal linux-3.5/fs/dcache.c linux-3.5-vs2.3.4/fs/dcache.c
  		found = dentry;
  		spin_unlock(&dentry->d_lock);
  		break;
-diff -NurpP --minimal linux-3.5/fs/devpts/inode.c linux-3.5-vs2.3.4/fs/devpts/inode.c
---- linux-3.5/fs/devpts/inode.c	2012-07-22 23:39:38.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/devpts/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/devpts/inode.c linux-3.5.1-vs2.3.4.1/fs/devpts/inode.c
+--- linux-3.5.1/fs/devpts/inode.c	2012-07-22 23:39:38.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/devpts/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/parser.h>
  #include <linux/fsnotify.h>
@@ -2247,9 +2247,9 @@ diff -NurpP --minimal linux-3.5/fs/devpts/inode.c linux-3.5-vs2.3.4/fs/devpts/in
  	inode->i_private = tty;
  	tty->driver_data = inode;
  
-diff -NurpP --minimal linux-3.5/fs/ext2/balloc.c linux-3.5-vs2.3.4/fs/ext2/balloc.c
---- linux-3.5/fs/ext2/balloc.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/balloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/balloc.c linux-3.5.1-vs2.3.4.1/fs/ext2/balloc.c
+--- linux-3.5.1/fs/ext2/balloc.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/balloc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block 
  			start = 0;
  		end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2258,9 +2258,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/balloc.c linux-3.5-vs2.3.4/fs/ext2/ballo
  	BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
  
  repeat:
-diff -NurpP --minimal linux-3.5/fs/ext2/ext2.h linux-3.5-vs2.3.4/fs/ext2/ext2.h
---- linux-3.5/fs/ext2/ext2.h	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/ext2.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/ext2.h linux-3.5.1-vs2.3.4.1/fs/ext2/ext2.h
+--- linux-3.5.1/fs/ext2/ext2.h	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/ext2.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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) */
@@ -2308,18 +2308,18 @@ diff -NurpP --minimal linux-3.5/fs/ext2/ext2.h linux-3.5-vs2.3.4/fs/ext2/ext2.h
  
  /* ioctl.c */
  extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.5/fs/ext2/file.c linux-3.5-vs2.3.4/fs/ext2/file.c
---- linux-3.5/fs/ext2/file.c	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/file.c linux-3.5.1-vs2.3.4.1/fs/ext2/file.c
+--- linux-3.5.1/fs/ext2/file.c	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -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.5/fs/ext2/ialloc.c linux-3.5-vs2.3.4/fs/ext2/ialloc.c
---- linux-3.5/fs/ext2/ialloc.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/ialloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/ialloc.c linux-3.5.1-vs2.3.4.1/fs/ext2/ialloc.c
+--- linux-3.5.1/fs/ext2/ialloc.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/ialloc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/backing-dev.h>
  #include <linux/buffer_head.h>
@@ -2336,9 +2336,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/ialloc.c linux-3.5-vs2.3.4/fs/ext2/iallo
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.5/fs/ext2/inode.c linux-3.5-vs2.3.4/fs/ext2/inode.c
---- linux-3.5/fs/ext2/inode.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/inode.c	2012-07-23 11:01:46.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/inode.c linux-3.5.1-vs2.3.4.1/fs/ext2/inode.c
+--- linux-3.5.1/fs/ext2/inode.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/inode.c	2012-07-23 11:01:46.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/mpage.h>
  #include <linux/fiemap.h>
@@ -2469,9 +2469,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/inode.c linux-3.5-vs2.3.4/fs/ext2/inode.
  		error = dquot_transfer(inode, iattr);
  		if (error)
  			return error;
-diff -NurpP --minimal linux-3.5/fs/ext2/ioctl.c linux-3.5-vs2.3.4/fs/ext2/ioctl.c
---- linux-3.5/fs/ext2/ioctl.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/ext2/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/ioctl.c linux-3.5.1-vs2.3.4.1/fs/ext2/ioctl.c
+--- linux-3.5.1/fs/ext2/ioctl.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -17,6 +17,16 @@
  #include <asm/uaccess.h>
  
@@ -2521,9 +2521,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/ioctl.c linux-3.5-vs2.3.4/fs/ext2/ioctl.
  		flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
  		ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.5/fs/ext2/namei.c linux-3.5-vs2.3.4/fs/ext2/namei.c
---- linux-3.5/fs/ext2/namei.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/namei.c linux-3.5.1-vs2.3.4.1/fs/ext2/namei.c
+--- linux-3.5.1/fs/ext2/namei.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/namei.c	2012-07-23 01:45:55.000000000 +0200
 @@ -32,6 +32,7 @@
  
  #include <linux/pagemap.h>
@@ -2548,9 +2548,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/namei.c linux-3.5-vs2.3.4/fs/ext2/namei.
  	.get_acl	= ext2_get_acl,
  };
  
-diff -NurpP --minimal linux-3.5/fs/ext2/super.c linux-3.5-vs2.3.4/fs/ext2/super.c
---- linux-3.5/fs/ext2/super.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext2/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext2/super.c linux-3.5.1-vs2.3.4.1/fs/ext2/super.c
+--- linux-3.5.1/fs/ext2/super.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext2/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -386,7 +386,8 @@ enum {
  	Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
  	Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -2616,9 +2616,9 @@ diff -NurpP --minimal linux-3.5/fs/ext2/super.c linux-3.5-vs2.3.4/fs/ext2/super.
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.5/fs/ext3/ext3.h linux-3.5-vs2.3.4/fs/ext3/ext3.h
---- linux-3.5/fs/ext3/ext3.h	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/ext3.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/ext3.h linux-3.5.1-vs2.3.4.1/fs/ext3/ext3.h
+--- linux-3.5.1/fs/ext3/ext3.h	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/ext3.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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) */
@@ -2670,9 +2670,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/ext3.h linux-3.5-vs2.3.4/fs/ext3/ext3.h
  
  /* ioctl.c */
  extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.5/fs/ext3/file.c linux-3.5-vs2.3.4/fs/ext3/file.c
---- linux-3.5/fs/ext3/file.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/file.c linux-3.5.1-vs2.3.4.1/fs/ext3/file.c
+--- linux-3.5.1/fs/ext3/file.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -76,5 +76,6 @@ const struct inode_operations ext3_file_
  #endif
  	.get_acl	= ext3_get_acl,
@@ -2680,9 +2680,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/file.c linux-3.5-vs2.3.4/fs/ext3/file.c
 +	.sync_flags	= ext3_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.5/fs/ext3/ialloc.c linux-3.5-vs2.3.4/fs/ext3/ialloc.c
---- linux-3.5/fs/ext3/ialloc.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/ialloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/ialloc.c linux-3.5.1-vs2.3.4.1/fs/ext3/ialloc.c
+--- linux-3.5.1/fs/ext3/ialloc.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/ialloc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -14,6 +14,7 @@
  
  #include <linux/quotaops.h>
@@ -2699,9 +2699,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/ialloc.c linux-3.5-vs2.3.4/fs/ext3/iallo
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.5/fs/ext3/inode.c linux-3.5-vs2.3.4/fs/ext3/inode.c
---- linux-3.5/fs/ext3/inode.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/inode.c	2012-07-23 10:35:58.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/inode.c linux-3.5.1-vs2.3.4.1/fs/ext3/inode.c
+--- linux-3.5.1/fs/ext3/inode.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/inode.c	2012-07-23 10:35:58.000000000 +0200
 @@ -27,6 +27,8 @@
  #include <linux/writeback.h>
  #include <linux/mpage.h>
@@ -2832,9 +2832,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/inode.c linux-3.5-vs2.3.4/fs/ext3/inode.
  		error = ext3_mark_inode_dirty(handle, inode);
  		ext3_journal_stop(handle);
  	}
-diff -NurpP --minimal linux-3.5/fs/ext3/ioctl.c linux-3.5-vs2.3.4/fs/ext3/ioctl.c
---- linux-3.5/fs/ext3/ioctl.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/ioctl.c linux-3.5.1-vs2.3.4.1/fs/ext3/ioctl.c
+--- linux-3.5.1/fs/ext3/ioctl.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -12,6 +12,34 @@
  #include <asm/uaccess.h>
  #include "ext3.h"
@@ -2902,9 +2902,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/ioctl.c linux-3.5-vs2.3.4/fs/ext3/ioctl.
  		flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
  		ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.5/fs/ext3/namei.c linux-3.5-vs2.3.4/fs/ext3/namei.c
---- linux-3.5/fs/ext3/namei.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/namei.c linux-3.5.1-vs2.3.4.1/fs/ext3/namei.c
+--- linux-3.5.1/fs/ext3/namei.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/namei.c	2012-07-23 01:45:55.000000000 +0200
 @@ -25,6 +25,8 @@
   */
  
@@ -2930,9 +2930,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/namei.c linux-3.5-vs2.3.4/fs/ext3/namei.
  	.get_acl	= ext3_get_acl,
  };
  
-diff -NurpP --minimal linux-3.5/fs/ext3/super.c linux-3.5-vs2.3.4/fs/ext3/super.c
---- linux-3.5/fs/ext3/super.c	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext3/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext3/super.c linux-3.5.1-vs2.3.4.1/fs/ext3/super.c
+--- linux-3.5.1/fs/ext3/super.c	2012-07-22 23:39:39.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext3/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -822,7 +822,8 @@ enum {
  	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
  	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -2999,9 +2999,9 @@ diff -NurpP --minimal linux-3.5/fs/ext3/super.c linux-3.5-vs2.3.4/fs/ext3/super.
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.5/fs/ext4/ext4.h linux-3.5-vs2.3.4/fs/ext4/ext4.h
---- linux-3.5/fs/ext4/ext4.h	2012-07-22 23:39:39.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/ext4.h	2012-07-23 10:43:43.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/ext4.h linux-3.5.1-vs2.3.4.1/fs/ext4/ext4.h
+--- linux-3.5.1/fs/ext4/ext4.h	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/ext4.h	2012-08-11 15:15:02.000000000 +0200
 @@ -393,8 +393,12 @@ struct flex_groups {
  #define EXT4_EXTENTS_FL			0x00080000 /* Inode uses extents */
  #define EXT4_EA_INODE_FL	        0x00200000 /* Inode used for large EA */
@@ -3048,9 +3048,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/ext4.h linux-3.5-vs2.3.4/fs/ext4/ext4.h
  /* move_extent.c */
  extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
  			     __u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.5/fs/ext4/file.c linux-3.5-vs2.3.4/fs/ext4/file.c
---- linux-3.5/fs/ext4/file.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/file.c linux-3.5.1-vs2.3.4.1/fs/ext4/file.c
+--- linux-3.5.1/fs/ext4/file.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -258,5 +258,6 @@ const struct inode_operations ext4_file_
  #endif
  	.get_acl	= ext4_get_acl,
@@ -3058,9 +3058,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/file.c linux-3.5-vs2.3.4/fs/ext4/file.c
 +	.sync_flags	= ext4_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.5/fs/ext4/ialloc.c linux-3.5-vs2.3.4/fs/ext4/ialloc.c
---- linux-3.5/fs/ext4/ialloc.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/ialloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/ialloc.c linux-3.5.1-vs2.3.4.1/fs/ext4/ialloc.c
+--- linux-3.5.1/fs/ext4/ialloc.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/ialloc.c	2012-08-11 15:15:02.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/random.h>
  #include <linux/bitops.h>
@@ -3077,9 +3077,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/ialloc.c linux-3.5-vs2.3.4/fs/ext4/iallo
  	} else
  		inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.c
---- linux-3.5/fs/ext4/inode.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/inode.c	2012-07-23 10:42:05.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/inode.c linux-3.5.1-vs2.3.4.1/fs/ext4/inode.c
+--- linux-3.5.1/fs/ext4/inode.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/inode.c	2012-08-11 15:15:02.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/printk.h>
  #include <linux/slab.h>
@@ -3088,7 +3088,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  
  #include "ext4_jbd2.h"
  #include "xattr.h"
-@@ -3626,41 +3627,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -3645,41 +3646,64 @@ void ext4_set_inode_flags(struct inode *
  {
  	unsigned int flags = EXT4_I(inode)->i_flags;
  
@@ -3160,7 +3160,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  	} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
  }
  
-@@ -3752,8 +3776,10 @@ struct inode *ext4_iget(struct super_blo
+@@ -3771,8 +3795,10 @@ struct inode *ext4_iget(struct super_blo
  		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
  		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
  	}
@@ -3173,7 +3173,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
  
  	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
-@@ -3976,8 +4002,8 @@ static int ext4_do_update_inode(handle_t
+@@ -3995,8 +4021,8 @@ static int ext4_do_update_inode(handle_t
  
  	ext4_get_inode_flags(ei);
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
@@ -3184,7 +3184,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  	if (!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));
  		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
-@@ -4000,6 +4026,9 @@ static int ext4_do_update_inode(handle_t
+@@ -4019,6 +4045,9 @@ static int ext4_do_update_inode(handle_t
  		raw_inode->i_uid_high = 0;
  		raw_inode->i_gid_high = 0;
  	}
@@ -3194,7 +3194,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  	raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
  
  	EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -4185,7 +4214,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -4204,7 +4233,8 @@ int ext4_setattr(struct dentry *dentry, 
  	if (is_quota_modification(inode, attr))
  		dquot_initialize(inode);
  	if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) ||
@@ -3204,7 +3204,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  		handle_t *handle;
  
  		/* (user+group)*(old+new) structure, inode write (sb,
-@@ -4207,6 +4237,8 @@ int ext4_setattr(struct dentry *dentry, 
+@@ -4226,6 +4256,8 @@ int ext4_setattr(struct dentry *dentry, 
  			inode->i_uid = attr->ia_uid;
  		if (attr->ia_valid & ATTR_GID)
  			inode->i_gid = attr->ia_gid;
@@ -3213,9 +3213,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/inode.c linux-3.5-vs2.3.4/fs/ext4/inode.
  		error = ext4_mark_inode_dirty(handle, inode);
  		ext4_journal_stop(handle);
  	}
-diff -NurpP --minimal linux-3.5/fs/ext4/ioctl.c linux-3.5-vs2.3.4/fs/ext4/ioctl.c
---- linux-3.5/fs/ext4/ioctl.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/ioctl.c linux-3.5.1-vs2.3.4.1/fs/ext4/ioctl.c
+--- linux-3.5.1/fs/ext4/ioctl.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -14,12 +14,40 @@
  #include <linux/compat.h>
  #include <linux/mount.h>
@@ -3280,9 +3280,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/ioctl.c linux-3.5-vs2.3.4/fs/ext4/ioctl.
  			if (!capable(CAP_LINUX_IMMUTABLE))
  				goto flags_out;
  		}
-diff -NurpP --minimal linux-3.5/fs/ext4/namei.c linux-3.5-vs2.3.4/fs/ext4/namei.c
---- linux-3.5/fs/ext4/namei.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/namei.c linux-3.5.1-vs2.3.4.1/fs/ext4/namei.c
+--- linux-3.5.1/fs/ext4/namei.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/namei.c	2012-08-11 15:15:02.000000000 +0200
 @@ -34,6 +34,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -3299,7 +3299,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/namei.c linux-3.5-vs2.3.4/fs/ext4/namei.
  		}
  		if ((bh = bh_use[ra_ptr++]) == NULL)
  			goto next;
-@@ -2977,6 +2979,7 @@ const struct inode_operations ext4_dir_i
+@@ -2984,6 +2986,7 @@ const struct inode_operations ext4_dir_i
  #endif
  	.get_acl	= ext4_get_acl,
  	.fiemap         = ext4_fiemap,
@@ -3307,9 +3307,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/namei.c linux-3.5-vs2.3.4/fs/ext4/namei.
  };
  
  const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.5/fs/ext4/super.c linux-3.5-vs2.3.4/fs/ext4/super.c
---- linux-3.5/fs/ext4/super.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ext4/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ext4/super.c linux-3.5.1-vs2.3.4.1/fs/ext4/super.c
+--- linux-3.5.1/fs/ext4/super.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ext4/super.c	2012-08-11 15:15:02.000000000 +0200
 @@ -1231,6 +1231,7 @@ enum {
  	Opt_inode_readahead_blks, Opt_journal_ioprio,
  	Opt_dioread_nolock, Opt_dioread_lock,
@@ -3349,7 +3349,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/super.c linux-3.5-vs2.3.4/fs/ext4/super.
  	}
  
  	for (m = ext4_mount_opts; m->token != Opt_err; m++) {
-@@ -3305,6 +3323,9 @@ static int ext4_fill_super(struct super_
+@@ -3413,6 +3431,9 @@ static int ext4_fill_super(struct super_
  		}
  	}
  
@@ -3359,7 +3359,7 @@ diff -NurpP --minimal linux-3.5/fs/ext4/super.c linux-3.5-vs2.3.4/fs/ext4/super.
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-@@ -4448,6 +4469,14 @@ static int ext4_remount(struct super_blo
+@@ -4568,6 +4589,14 @@ static int ext4_remount(struct super_blo
  	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)
  		ext4_abort(sb, "Abort forced by user");
  
@@ -3374,9 +3374,9 @@ diff -NurpP --minimal linux-3.5/fs/ext4/super.c linux-3.5-vs2.3.4/fs/ext4/super.
  	sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
  		(test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.5/fs/fcntl.c linux-3.5-vs2.3.4/fs/fcntl.c
---- linux-3.5/fs/fcntl.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/fcntl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/fcntl.c linux-3.5.1-vs2.3.4.1/fs/fcntl.c
+--- linux-3.5.1/fs/fcntl.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/fcntl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
@@ -3403,9 +3403,9 @@ diff -NurpP --minimal linux-3.5/fs/fcntl.c linux-3.5-vs2.3.4/fs/fcntl.c
  
  	if (unlikely(filp->f_mode & FMODE_PATH)) {
  		if (!check_fcntl_cmd(cmd))
-diff -NurpP --minimal linux-3.5/fs/file.c linux-3.5-vs2.3.4/fs/file.c
---- linux-3.5/fs/file.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/file.c linux-3.5.1-vs2.3.4.1/fs/file.c
+--- linux-3.5.1/fs/file.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
@@ -3431,9 +3431,9 @@ diff -NurpP --minimal linux-3.5/fs/file.c linux-3.5-vs2.3.4/fs/file.c
  #if 1
  	/* Sanity check */
  	if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.5/fs/file_table.c linux-3.5-vs2.3.4/fs/file_table.c
---- linux-3.5/fs/file_table.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/file_table.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/file_table.c linux-3.5.1-vs2.3.4.1/fs/file_table.c
+--- linux-3.5.1/fs/file_table.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/file_table.c	2012-07-23 01:45:55.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <linux/percpu_counter.h>
  #include <linux/percpu.h>
@@ -3470,9 +3470,9 @@ diff -NurpP --minimal linux-3.5/fs/file_table.c linux-3.5-vs2.3.4/fs/file_table.
  		file_sb_list_del(file);
  		file_free(file);
  	}
-diff -NurpP --minimal linux-3.5/fs/fs_struct.c linux-3.5-vs2.3.4/fs/fs_struct.c
---- linux-3.5/fs/fs_struct.c	2012-05-21 18:07:20.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/fs_struct.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/fs_struct.c linux-3.5.1-vs2.3.4.1/fs/fs_struct.c
+--- linux-3.5.1/fs/fs_struct.c	2012-05-21 18:07:20.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/fs_struct.c	2012-07-23 01:45:55.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -3497,9 +3497,9 @@ diff -NurpP --minimal linux-3.5/fs/fs_struct.c linux-3.5-vs2.3.4/fs/fs_struct.c
  	}
  	return fs;
  }
-diff -NurpP --minimal linux-3.5/fs/gfs2/file.c linux-3.5-vs2.3.4/fs/gfs2/file.c
---- linux-3.5/fs/gfs2/file.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/gfs2/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/gfs2/file.c linux-3.5.1-vs2.3.4.1/fs/gfs2/file.c
+--- linux-3.5.1/fs/gfs2/file.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/gfs2/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -142,6 +142,9 @@ static const u32 fsflags_to_gfs2[32] = {
  	[7] = GFS2_DIF_NOATIME,
  	[12] = GFS2_DIF_EXHASH,
@@ -3622,9 +3622,9 @@ diff -NurpP --minimal linux-3.5/fs/gfs2/file.c linux-3.5-vs2.3.4/fs/gfs2/file.c
  static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	switch(cmd) {
-diff -NurpP --minimal linux-3.5/fs/gfs2/inode.h linux-3.5-vs2.3.4/fs/gfs2/inode.h
---- linux-3.5/fs/gfs2/inode.h	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/gfs2/inode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/gfs2/inode.h linux-3.5.1-vs2.3.4.1/fs/gfs2/inode.h
+--- linux-3.5.1/fs/gfs2/inode.h	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/gfs2/inode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2
  extern const struct file_operations gfs2_dir_fops_nolock;
  
@@ -3633,9 +3633,9 @@ diff -NurpP --minimal linux-3.5/fs/gfs2/inode.h linux-3.5-vs2.3.4/fs/gfs2/inode.
   
  #ifdef CONFIG_GFS2_FS_LOCKING_DLM
  extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.5/fs/inode.c linux-3.5-vs2.3.4/fs/inode.c
---- linux-3.5/fs/inode.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/inode.c linux-3.5.1-vs2.3.4.1/fs/inode.c
+--- linux-3.5.1/fs/inode.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/prefetch.h>
  #include <linux/buffer_head.h> /* for inode_has_buffers */
@@ -3691,9 +3691,9 @@ diff -NurpP --minimal linux-3.5/fs/inode.c linux-3.5-vs2.3.4/fs/inode.c
  }
  EXPORT_SYMBOL(inode_init_owner);
  
-diff -NurpP --minimal linux-3.5/fs/ioctl.c linux-3.5-vs2.3.4/fs/ioctl.c
---- linux-3.5/fs/ioctl.c	2012-05-21 18:07:24.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ioctl.c linux-3.5.1-vs2.3.4.1/fs/ioctl.c
+--- linux-3.5.1/fs/ioctl.c	2012-05-21 18:07:24.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -15,6 +15,9 @@
  #include <linux/writeback.h>
  #include <linux/buffer_head.h>
@@ -3704,9 +3704,9 @@ diff -NurpP --minimal linux-3.5/fs/ioctl.c linux-3.5-vs2.3.4/fs/ioctl.c
  
  #include <asm/ioctls.h>
  
-diff -NurpP --minimal linux-3.5/fs/ioprio.c linux-3.5-vs2.3.4/fs/ioprio.c
---- linux-3.5/fs/ioprio.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ioprio.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ioprio.c linux-3.5.1-vs2.3.4.1/fs/ioprio.c
+--- linux-3.5.1/fs/ioprio.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ioprio.c	2012-07-23 01:45:55.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/syscalls.h>
  #include <linux/security.h>
@@ -3733,9 +3733,9 @@ diff -NurpP --minimal linux-3.5/fs/ioprio.c linux-3.5-vs2.3.4/fs/ioprio.c
  				tmpio = get_task_ioprio(p);
  				if (tmpio < 0)
  					continue;
-diff -NurpP --minimal linux-3.5/fs/jfs/file.c linux-3.5-vs2.3.4/fs/jfs/file.c
---- linux-3.5/fs/jfs/file.c	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/jfs/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/file.c linux-3.5.1-vs2.3.4.1/fs/jfs/file.c
+--- linux-3.5.1/fs/jfs/file.c	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s
  	if (is_quota_modification(inode, iattr))
  		dquot_initialize(inode);
@@ -3754,9 +3754,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/file.c linux-3.5-vs2.3.4/fs/jfs/file.c
  };
  
  const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.5/fs/jfs/ioctl.c linux-3.5-vs2.3.4/fs/jfs/ioctl.c
---- linux-3.5/fs/jfs/ioctl.c	2012-03-19 19:47:25.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/jfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/ioctl.c linux-3.5.1-vs2.3.4.1/fs/jfs/ioctl.c
+--- linux-3.5.1/fs/jfs/ioctl.c	2012-03-19 19:47:25.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/mount.h>
  #include <linux/time.h>
@@ -3814,9 +3814,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/ioctl.c linux-3.5-vs2.3.4/fs/jfs/ioctl.c
  		flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
  		jfs_inode->mode2 = flags;
  
-diff -NurpP --minimal linux-3.5/fs/jfs/jfs_dinode.h linux-3.5-vs2.3.4/fs/jfs/jfs_dinode.h
---- linux-3.5/fs/jfs/jfs_dinode.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/jfs/jfs_dinode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/jfs_dinode.h linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_dinode.h
+--- linux-3.5.1/fs/jfs/jfs_dinode.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_dinode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -161,9 +161,13 @@ struct dinode {
  
  #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
@@ -3833,9 +3833,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/jfs_dinode.h linux-3.5-vs2.3.4/fs/jfs/jfs
  #define JFS_FL_INHERIT		0x03C80000
  
  /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.5/fs/jfs/jfs_filsys.h linux-3.5-vs2.3.4/fs/jfs/jfs_filsys.h
---- linux-3.5/fs/jfs/jfs_filsys.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/jfs/jfs_filsys.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/jfs_filsys.h linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_filsys.h
+--- linux-3.5.1/fs/jfs/jfs_filsys.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_filsys.h	2012-07-23 01:45:55.000000000 +0200
 @@ -263,6 +263,7 @@
  #define JFS_NAME_MAX	255
  #define JFS_PATH_MAX	BPSIZE
@@ -3844,9 +3844,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/jfs_filsys.h linux-3.5-vs2.3.4/fs/jfs/jfs
  
  /*
   *	file system state (superblock state)
-diff -NurpP --minimal linux-3.5/fs/jfs/jfs_imap.c linux-3.5-vs2.3.4/fs/jfs/jfs_imap.c
---- linux-3.5/fs/jfs/jfs_imap.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/jfs/jfs_imap.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/jfs_imap.c linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_imap.c
+--- linux-3.5.1/fs/jfs/jfs_imap.c	2012-01-09 16:14:54.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_imap.c	2012-07-23 01:45:55.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/pagemap.h>
  #include <linux/quotaops.h>
@@ -3906,9 +3906,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/jfs_imap.c linux-3.5-vs2.3.4/fs/jfs/jfs_i
  	jfs_get_inode_flags(jfs_ip);
  	/*
  	 * mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.c linux-3.5-vs2.3.4/fs/jfs/jfs_inode.c
---- linux-3.5/fs/jfs/jfs_inode.c	2012-01-09 16:14:54.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/jfs/jfs_inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/jfs_inode.c linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_inode.c
+--- linux-3.5.1/fs/jfs/jfs_inode.c	2012-01-09 16:14:54.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -18,6 +18,7 @@
  
  #include <linux/fs.h>
@@ -3982,9 +3982,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.c linux-3.5-vs2.3.4/fs/jfs/jfs_
  }
  
  /*
-diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.h linux-3.5-vs2.3.4/fs/jfs/jfs_inode.h
---- linux-3.5/fs/jfs/jfs_inode.h	2011-10-24 18:45:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/jfs/jfs_inode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/jfs_inode.h linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_inode.h
+--- linux-3.5.1/fs/jfs/jfs_inode.h	2011-10-24 18:45:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/jfs_inode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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);
@@ -3993,9 +3993,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/jfs_inode.h linux-3.5-vs2.3.4/fs/jfs/jfs_
  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.5/fs/jfs/namei.c linux-3.5-vs2.3.4/fs/jfs/namei.c
---- linux-3.5/fs/jfs/namei.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/jfs/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/namei.c linux-3.5.1-vs2.3.4.1/fs/jfs/namei.c
+--- linux-3.5.1/fs/jfs/namei.c	2012-05-21 18:07:25.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/namei.c	2012-07-23 01:45:55.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/ctype.h>
  #include <linux/quotaops.h>
@@ -4020,9 +4020,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/namei.c linux-3.5-vs2.3.4/fs/jfs/namei.c
  };
  
  const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.5/fs/jfs/super.c linux-3.5-vs2.3.4/fs/jfs/super.c
---- linux-3.5/fs/jfs/super.c	2012-05-21 18:07:25.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/jfs/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/jfs/super.c linux-3.5.1-vs2.3.4.1/fs/jfs/super.c
+--- linux-3.5.1/fs/jfs/super.c	2012-05-21 18:07:25.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/jfs/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -197,7 +197,8 @@ static void jfs_put_super(struct super_b
  enum {
  	Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4088,9 +4088,9 @@ diff -NurpP --minimal linux-3.5/fs/jfs/super.c linux-3.5-vs2.3.4/fs/jfs/super.c
  
  	if (newLVSize) {
  		printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.5/fs/libfs.c linux-3.5-vs2.3.4/fs/libfs.c
---- linux-3.5/fs/libfs.c	2012-07-22 23:39:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/libfs.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/libfs.c linux-3.5.1-vs2.3.4.1/fs/libfs.c
+--- linux-3.5.1/fs/libfs.c	2012-07-22 23:39:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/libfs.c	2012-07-23 01:45:55.000000000 +0200
 @@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru
   * both impossible due to the lock on directory.
   */
@@ -4136,9 +4136,9 @@ diff -NurpP --minimal linux-3.5/fs/libfs.c linux-3.5-vs2.3.4/fs/libfs.c
  EXPORT_SYMBOL(generic_read_dir);
  EXPORT_SYMBOL(mount_pseudo);
  EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.5/fs/locks.c linux-3.5-vs2.3.4/fs/locks.c
---- linux-3.5/fs/locks.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/locks.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/locks.c linux-3.5.1-vs2.3.4.1/fs/locks.c
+--- linux-3.5.1/fs/locks.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/locks.c	2012-08-11 15:15:02.000000000 +0200
 @@ -126,6 +126,8 @@
  #include <linux/time.h>
  #include <linux/rcupdate.h>
@@ -4336,9 +4336,9 @@ diff -NurpP --minimal linux-3.5/fs/locks.c linux-3.5-vs2.3.4/fs/locks.c
  
  	return 0;
  }
-diff -NurpP --minimal linux-3.5/fs/mount.h linux-3.5-vs2.3.4/fs/mount.h
---- linux-3.5/fs/mount.h	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/mount.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/mount.h linux-3.5.1-vs2.3.4.1/fs/mount.h
+--- linux-3.5.1/fs/mount.h	2012-03-19 19:47:26.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/mount.h	2012-07-23 01:45:55.000000000 +0200
 @@ -47,6 +47,7 @@ struct mount {
  	int mnt_expiry_mark;		/* true if marked for expiry */
  	int mnt_pinned;
@@ -4347,9 +4347,9 @@ diff -NurpP --minimal linux-3.5/fs/mount.h linux-3.5-vs2.3.4/fs/mount.h
  };
  
  static inline struct mount *real_mount(struct vfsmount *mnt)
-diff -NurpP --minimal linux-3.5/fs/namei.c linux-3.5-vs2.3.4/fs/namei.c
---- linux-3.5/fs/namei.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/namei.c	2012-07-23 10:46:40.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/namei.c linux-3.5.1-vs2.3.4.1/fs/namei.c
+--- linux-3.5.1/fs/namei.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/namei.c	2012-07-23 10:46:40.000000000 +0200
 @@ -34,6 +34,14 @@
  #include <linux/device_cgroup.h>
  #include <linux/fs_struct.h>
@@ -4876,9 +4876,9 @@ diff -NurpP --minimal linux-3.5/fs/namei.c linux-3.5-vs2.3.4/fs/namei.c
  EXPORT_SYMBOL(dentry_unhash);
  EXPORT_SYMBOL(generic_readlink);
 +EXPORT_SYMBOL(vx_info_mnt_namespace);
-diff -NurpP --minimal linux-3.5/fs/namespace.c linux-3.5-vs2.3.4/fs/namespace.c
---- linux-3.5/fs/namespace.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/namespace.c	2012-07-23 10:44:12.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/namespace.c linux-3.5.1-vs2.3.4.1/fs/namespace.c
+--- linux-3.5.1/fs/namespace.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/namespace.c	2012-07-23 10:44:12.000000000 +0200
 @@ -20,6 +20,11 @@
  #include <linux/fs_struct.h>	/* get_fs_root et.al. */
  #include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */
@@ -5065,9 +5065,9 @@ diff -NurpP --minimal linux-3.5/fs/namespace.c linux-3.5-vs2.3.4/fs/namespace.c
  	kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.5/fs/nfs/client.c linux-3.5-vs2.3.4/fs/nfs/client.c
---- linux-3.5/fs/nfs/client.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfs/client.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfs/client.c linux-3.5.1-vs2.3.4.1/fs/nfs/client.c
+--- linux-3.5.1/fs/nfs/client.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfs/client.c	2012-07-23 01:45:55.000000000 +0200
 @@ -797,6 +797,9 @@ static int nfs_init_server_rpcclient(str
  	if (server->flags & NFS_MOUNT_SOFT)
  		server->client->cl_softrtry = 1;
@@ -5089,9 +5089,9 @@ diff -NurpP --minimal linux-3.5/fs/nfs/client.c linux-3.5-vs2.3.4/fs/nfs/client.
  	server->maxfilesize = fsinfo->maxfilesize;
  
  	server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.5/fs/nfs/dir.c linux-3.5-vs2.3.4/fs/nfs/dir.c
---- linux-3.5/fs/nfs/dir.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfs/dir.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfs/dir.c linux-3.5.1-vs2.3.4.1/fs/nfs/dir.c
+--- linux-3.5.1/fs/nfs/dir.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfs/dir.c	2012-07-23 01:45:55.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/sched.h>
  #include <linux/kmemleak.h>
@@ -5108,9 +5108,9 @@ diff -NurpP --minimal linux-3.5/fs/nfs/dir.c linux-3.5-vs2.3.4/fs/nfs/dir.c
  no_entry:
  	res = d_materialise_unique(dentry, inode);
  	if (res != NULL) {
-diff -NurpP --minimal linux-3.5/fs/nfs/inode.c linux-3.5-vs2.3.4/fs/nfs/inode.c
---- linux-3.5/fs/nfs/inode.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfs/inode.c	2012-07-23 10:48:04.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfs/inode.c linux-3.5.1-vs2.3.4.1/fs/nfs/inode.c
+--- linux-3.5.1/fs/nfs/inode.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfs/inode.c	2012-07-23 10:48:04.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/compat.h>
  #include <linux/freezer.h>
@@ -5260,9 +5260,9 @@ diff -NurpP --minimal linux-3.5/fs/nfs/inode.c linux-3.5-vs2.3.4/fs/nfs/inode.c
  	if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
  		if (inode->i_nlink != fattr->nlink) {
  			invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.5/fs/nfs/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfs/nfs3xdr.c
---- linux-3.5/fs/nfs/nfs3xdr.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfs/nfs3xdr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfs/nfs3xdr.c linux-3.5.1-vs2.3.4.1/fs/nfs/nfs3xdr.c
+--- linux-3.5.1/fs/nfs/nfs3xdr.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfs/nfs3xdr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/nfs3.h>
  #include <linux/nfs_fs.h>
@@ -5408,9 +5408,9 @@ diff -NurpP --minimal linux-3.5/fs/nfs/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfs/nfs3xd
  }
  
  /*
-diff -NurpP --minimal linux-3.5/fs/nfs/super.c linux-3.5-vs2.3.4/fs/nfs/super.c
---- linux-3.5/fs/nfs/super.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfs/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfs/super.c linux-3.5.1-vs2.3.4.1/fs/nfs/super.c
+--- linux-3.5.1/fs/nfs/super.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfs/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -54,6 +54,7 @@
  #include <linux/parser.h>
  #include <linux/nsproxy.h>
@@ -5482,9 +5482,9 @@ diff -NurpP --minimal linux-3.5/fs/nfs/super.c linux-3.5-vs2.3.4/fs/nfs/super.c
  
  		/*
  		 * options that take text values
-diff -NurpP --minimal linux-3.5/fs/nfsd/auth.c linux-3.5-vs2.3.4/fs/nfsd/auth.c
---- linux-3.5/fs/nfsd/auth.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfsd/auth.c	2012-07-23 10:47:00.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfsd/auth.c linux-3.5.1-vs2.3.4.1/fs/nfsd/auth.c
+--- linux-3.5.1/fs/nfsd/auth.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfsd/auth.c	2012-07-23 10:47:00.000000000 +0200
 @@ -2,6 +2,7 @@
  
  #include <linux/sched.h>
@@ -5503,9 +5503,9 @@ diff -NurpP --minimal linux-3.5/fs/nfsd/auth.c linux-3.5-vs2.3.4/fs/nfsd/auth.c
  
  	rqgi = rqstp->rq_cred.cr_group_info;
  
-diff -NurpP --minimal linux-3.5/fs/nfsd/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs3xdr.c
---- linux-3.5/fs/nfsd/nfs3xdr.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfsd/nfs3xdr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfsd/nfs3xdr.c linux-3.5.1-vs2.3.4.1/fs/nfsd/nfs3xdr.c
+--- linux-3.5.1/fs/nfsd/nfs3xdr.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfsd/nfs3xdr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -7,6 +7,7 @@
   */
  
@@ -5556,9 +5556,9 @@ diff -NurpP --minimal linux-3.5/fs/nfsd/nfs3xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs3
  	if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
  		p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
  	} else {
-diff -NurpP --minimal linux-3.5/fs/nfsd/nfs4xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs4xdr.c
---- linux-3.5/fs/nfsd/nfs4xdr.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfsd/nfs4xdr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfsd/nfs4xdr.c linux-3.5.1-vs2.3.4.1/fs/nfsd/nfs4xdr.c
+--- linux-3.5.1/fs/nfsd/nfs4xdr.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfsd/nfs4xdr.c	2012-08-11 15:15:02.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/utsname.h>
  #include <linux/pagemap.h>
@@ -5588,9 +5588,9 @@ diff -NurpP --minimal linux-3.5/fs/nfsd/nfs4xdr.c linux-3.5-vs2.3.4/fs/nfsd/nfs4
  		if (status == nfserr_resource)
  			goto out_resource;
  		if (status)
-diff -NurpP --minimal linux-3.5/fs/nfsd/nfsxdr.c linux-3.5-vs2.3.4/fs/nfsd/nfsxdr.c
---- linux-3.5/fs/nfsd/nfsxdr.c	2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/nfsd/nfsxdr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/nfsd/nfsxdr.c linux-3.5.1-vs2.3.4.1/fs/nfsd/nfsxdr.c
+--- linux-3.5.1/fs/nfsd/nfsxdr.c	2011-05-22 16:17:53.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/nfsd/nfsxdr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -6,6 +6,7 @@
  
  #include "xdr.h"
@@ -5639,9 +5639,9 @@ diff -NurpP --minimal linux-3.5/fs/nfsd/nfsxdr.c linux-3.5-vs2.3.4/fs/nfsd/nfsxd
  
  	if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
  		*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.5/fs/ocfs2/dlmglue.c linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.c
---- linux-3.5/fs/ocfs2/dlmglue.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/dlmglue.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/dlmglue.c
+--- linux-3.5.1/fs/ocfs2/dlmglue.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/dlmglue.c	2012-07-23 01:45:55.000000000 +0200
 @@ -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(inode->i_uid);
@@ -5658,9 +5658,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/dlmglue.c linux-3.5-vs2.3.4/fs/ocfs2/dl
  	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.5/fs/ocfs2/dlmglue.h linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.h
---- linux-3.5/fs/ocfs2/dlmglue.h	2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/dlmglue.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/dlmglue.h linux-3.5.1-vs2.3.4.1/fs/ocfs2/dlmglue.h
+--- linux-3.5.1/fs/ocfs2/dlmglue.h	2010-10-21 13:07:50.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/dlmglue.h	2012-07-23 01:45:55.000000000 +0200
 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
  	__be16       lvb_inlink;
  	__be32       lvb_iattr;
@@ -5671,9 +5671,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/dlmglue.h linux-3.5-vs2.3.4/fs/ocfs2/dl
  };
  
  #define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.5/fs/ocfs2/file.c linux-3.5-vs2.3.4/fs/ocfs2/file.c
---- linux-3.5/fs/ocfs2/file.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/file.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/file.c
+--- linux-3.5.1/fs/ocfs2/file.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry,
  		attr->ia_valid &= ~ATTR_SIZE;
  
@@ -5683,9 +5683,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/file.c linux-3.5-vs2.3.4/fs/ocfs2/file.
  	if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
  		return 0;
  
-diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.c linux-3.5-vs2.3.4/fs/ocfs2/inode.c
---- linux-3.5/fs/ocfs2/inode.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/inode.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/inode.c
+--- linux-3.5.1/fs/ocfs2/inode.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
@@ -5782,9 +5782,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.c linux-3.5-vs2.3.4/fs/ocfs2/inod
  
  	/* Fast symlinks will have i_size but no allocated clusters. */
  	if (S_ISLNK(inode->i_mode) && !fe->i_clusters) {
-diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.h linux-3.5-vs2.3.4/fs/ocfs2/inode.h
---- linux-3.5/fs/ocfs2/inode.h	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/ocfs2/inode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/inode.h linux-3.5.1-vs2.3.4.1/fs/ocfs2/inode.h
+--- linux-3.5.1/fs/ocfs2/inode.h	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/inode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i
  
  void ocfs2_set_inode_flags(struct inode *inode);
@@ -5793,9 +5793,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/inode.h linux-3.5-vs2.3.4/fs/ocfs2/inod
  
  static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
  {
-diff -NurpP --minimal linux-3.5/fs/ocfs2/ioctl.c linux-3.5-vs2.3.4/fs/ocfs2/ioctl.c
---- linux-3.5/fs/ocfs2/ioctl.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/ioctl.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/ioctl.c
+--- linux-3.5.1/fs/ocfs2/ioctl.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i
  	return status;
  }
@@ -5859,9 +5859,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/ioctl.c linux-3.5-vs2.3.4/fs/ocfs2/ioct
  long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.5/fs/ocfs2/namei.c linux-3.5-vs2.3.4/fs/ocfs2/namei.c
---- linux-3.5/fs/ocfs2/namei.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/namei.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/namei.c
+--- linux-3.5.1/fs/ocfs2/namei.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/namei.c	2012-07-23 01:45:55.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/highmem.h>
@@ -5892,9 +5892,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/namei.c linux-3.5-vs2.3.4/fs/ocfs2/name
  	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.5/fs/ocfs2/ocfs2.h linux-3.5-vs2.3.4/fs/ocfs2/ocfs2.h
---- linux-3.5/fs/ocfs2/ocfs2.h	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/ocfs2/ocfs2.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/ocfs2.h linux-3.5.1-vs2.3.4.1/fs/ocfs2/ocfs2.h
+--- linux-3.5.1/fs/ocfs2/ocfs2.h	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/ocfs2.h	2012-07-23 01:45:55.000000000 +0200
 @@ -272,6 +272,7 @@ enum ocfs2_mount_options
  						     writes */
  	OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -5903,9 +5903,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/ocfs2.h linux-3.5-vs2.3.4/fs/ocfs2/ocfs
  };
  
  #define OCFS2_OSB_SOFT_RO			0x0001
-diff -NurpP --minimal linux-3.5/fs/ocfs2/ocfs2_fs.h linux-3.5-vs2.3.4/fs/ocfs2/ocfs2_fs.h
---- linux-3.5/fs/ocfs2/ocfs2_fs.h	2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/ocfs2_fs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/ocfs2_fs.h linux-3.5.1-vs2.3.4.1/fs/ocfs2/ocfs2_fs.h
+--- linux-3.5.1/fs/ocfs2/ocfs2_fs.h	2011-05-22 16:17:53.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/ocfs2_fs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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 */
@@ -5918,9 +5918,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/ocfs2_fs.h linux-3.5-vs2.3.4/fs/ocfs2/o
  #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.5/fs/ocfs2/super.c linux-3.5-vs2.3.4/fs/ocfs2/super.c
---- linux-3.5/fs/ocfs2/super.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/ocfs2/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/ocfs2/super.c linux-3.5.1-vs2.3.4.1/fs/ocfs2/super.c
+--- linux-3.5.1/fs/ocfs2/super.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/ocfs2/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -185,6 +185,7 @@ enum {
  	Opt_coherency_full,
  	Opt_resv_level,
@@ -5984,9 +5984,9 @@ diff -NurpP --minimal linux-3.5/fs/ocfs2/super.c linux-3.5-vs2.3.4/fs/ocfs2/supe
  		default:
  			mlog(ML_ERROR,
  			     "Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.5/fs/open.c linux-3.5-vs2.3.4/fs/open.c
---- linux-3.5/fs/open.c	2012-07-22 23:39:41.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/open.c	2012-07-23 10:53:28.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/open.c linux-3.5.1-vs2.3.4.1/fs/open.c
+--- linux-3.5.1/fs/open.c	2012-07-22 23:39:41.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/open.c	2012-07-23 10:53:28.000000000 +0200
 @@ -30,6 +30,11 @@
  #include <linux/fs_struct.h>
  #include <linux/ima.h>
@@ -6080,9 +6080,9 @@ diff -NurpP --minimal linux-3.5/fs/open.c linux-3.5-vs2.3.4/fs/open.c
  }
  
  void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.5/fs/proc/array.c linux-3.5-vs2.3.4/fs/proc/array.c
---- linux-3.5/fs/proc/array.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/array.c	2012-07-23 10:51:47.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/array.c linux-3.5.1-vs2.3.4.1/fs/proc/array.c
+--- linux-3.5.1/fs/proc/array.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/array.c	2012-07-23 10:51:47.000000000 +0200
 @@ -82,6 +82,8 @@
  #include <linux/ptrace.h>
  #include <linux/tracehook.h>
@@ -6196,9 +6196,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/array.c linux-3.5-vs2.3.4/fs/proc/array.
  	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.5/fs/proc/base.c linux-3.5-vs2.3.4/fs/proc/base.c
---- linux-3.5/fs/proc/base.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/base.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/base.c linux-3.5.1-vs2.3.4.1/fs/proc/base.c
+--- linux-3.5.1/fs/proc/base.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/base.c	2012-07-23 01:45:55.000000000 +0200
 @@ -85,6 +85,8 @@
  #include <linux/fs_struct.h>
  #include <linux/slab.h>
@@ -6360,9 +6360,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/base.c linux-3.5-vs2.3.4/fs/proc/base.c
  
  	ns = dentry->d_sb->s_fs_info;
  	rcu_read_lock();
-diff -NurpP --minimal linux-3.5/fs/proc/generic.c linux-3.5-vs2.3.4/fs/proc/generic.c
---- linux-3.5/fs/proc/generic.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/proc/generic.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/generic.c linux-3.5.1-vs2.3.4.1/fs/proc/generic.c
+--- linux-3.5.1/fs/proc/generic.c	2012-03-19 19:47:26.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/proc/generic.c	2012-07-23 01:45:55.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
@@ -6422,9 +6422,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/generic.c linux-3.5-vs2.3.4/fs/proc/gene
  		} else {
  			kfree(ent);
  			ent = NULL;
-diff -NurpP --minimal linux-3.5/fs/proc/inode.c linux-3.5-vs2.3.4/fs/proc/inode.c
---- linux-3.5/fs/proc/inode.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/inode.c linux-3.5.1-vs2.3.4.1/fs/proc/inode.c
+--- linux-3.5.1/fs/proc/inode.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -458,6 +458,8 @@ struct inode *proc_get_inode(struct supe
  			inode->i_uid = de->uid;
  			inode->i_gid = de->gid;
@@ -6434,9 +6434,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/inode.c linux-3.5-vs2.3.4/fs/proc/inode.
  		if (de->size)
  			inode->i_size = de->size;
  		if (de->nlink)
-diff -NurpP --minimal linux-3.5/fs/proc/internal.h linux-3.5-vs2.3.4/fs/proc/internal.h
---- linux-3.5/fs/proc/internal.h	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/internal.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/internal.h linux-3.5.1-vs2.3.4.1/fs/proc/internal.h
+--- linux-3.5.1/fs/proc/internal.h	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/internal.h	2012-07-23 01:45:55.000000000 +0200
 @@ -10,6 +10,8 @@
   */
  
@@ -6474,9 +6474,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/internal.h linux-3.5-vs2.3.4/fs/proc/int
  static inline int proc_fd(struct inode *inode)
  {
  	return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.5/fs/proc/loadavg.c linux-3.5-vs2.3.4/fs/proc/loadavg.c
---- linux-3.5/fs/proc/loadavg.c	2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/loadavg.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/loadavg.c linux-3.5.1-vs2.3.4.1/fs/proc/loadavg.c
+--- linux-3.5.1/fs/proc/loadavg.c	2009-09-10 15:26:23.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/loadavg.c	2012-07-23 01:45:55.000000000 +0200
 @@ -12,15 +12,27 @@
  
  static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -6506,9 +6506,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/loadavg.c linux-3.5-vs2.3.4/fs/proc/load
  		task_active_pid_ns(current)->last_pid);
  	return 0;
  }
-diff -NurpP --minimal linux-3.5/fs/proc/meminfo.c linux-3.5-vs2.3.4/fs/proc/meminfo.c
---- linux-3.5/fs/proc/meminfo.c	2012-01-09 16:14:55.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/proc/meminfo.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/meminfo.c linux-3.5.1-vs2.3.4.1/fs/proc/meminfo.c
+--- linux-3.5.1/fs/proc/meminfo.c	2012-01-09 16:14:55.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/proc/meminfo.c	2012-07-23 01:45:55.000000000 +0200
 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
  	allowed = ((totalram_pages - hugetlb_total_pages())
  		* sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -6519,9 +6519,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/meminfo.c linux-3.5-vs2.3.4/fs/proc/memi
  			total_swapcache_pages - i.bufferram;
  	if (cached < 0)
  		cached = 0;
-diff -NurpP --minimal linux-3.5/fs/proc/root.c linux-3.5-vs2.3.4/fs/proc/root.c
---- linux-3.5/fs/proc/root.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/root.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/root.c linux-3.5.1-vs2.3.4.1/fs/proc/root.c
+--- linux-3.5.1/fs/proc/root.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/root.c	2012-07-23 01:45:55.000000000 +0200
 @@ -19,9 +19,14 @@
  #include <linux/mount.h>
  #include <linux/pid_namespace.h>
@@ -6553,9 +6553,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/root.c linux-3.5-vs2.3.4/fs/proc/root.c
  	.name		= "/proc",
  };
  
-diff -NurpP --minimal linux-3.5/fs/proc/stat.c linux-3.5-vs2.3.4/fs/proc/stat.c
---- linux-3.5/fs/proc/stat.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc/stat.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/stat.c linux-3.5.1-vs2.3.4.1/fs/proc/stat.c
+--- linux-3.5.1/fs/proc/stat.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc/stat.c	2012-07-23 01:45:55.000000000 +0200
 @@ -9,6 +9,7 @@
  #include <linux/slab.h>
  #include <linux/time.h>
@@ -6575,9 +6575,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/stat.c linux-3.5-vs2.3.4/fs/proc/stat.c
  	jif = boottime.tv_sec;
  
  	for_each_possible_cpu(i) {
-diff -NurpP --minimal linux-3.5/fs/proc/uptime.c linux-3.5-vs2.3.4/fs/proc/uptime.c
---- linux-3.5/fs/proc/uptime.c	2012-03-19 19:47:26.000000000 +0100
-+++ linux-3.5-vs2.3.4/fs/proc/uptime.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc/uptime.c linux-3.5.1-vs2.3.4.1/fs/proc/uptime.c
+--- linux-3.5.1/fs/proc/uptime.c	2012-03-19 19:47:26.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/fs/proc/uptime.c	2012-07-23 01:45:55.000000000 +0200
 @@ -5,6 +5,7 @@
  #include <linux/seq_file.h>
  #include <linux/time.h>
@@ -6597,9 +6597,9 @@ diff -NurpP --minimal linux-3.5/fs/proc/uptime.c linux-3.5-vs2.3.4/fs/proc/uptim
  	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.5/fs/proc_namespace.c linux-3.5-vs2.3.4/fs/proc_namespace.c
---- linux-3.5/fs/proc_namespace.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/proc_namespace.c	2012-07-23 11:01:00.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/proc_namespace.c linux-3.5.1-vs2.3.4.1/fs/proc_namespace.c
+--- linux-3.5.1/fs/proc_namespace.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/proc_namespace.c	2012-07-23 11:01:00.000000000 +0200
 @@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file 
  		{ MS_SYNCHRONOUS, ",sync" },
  		{ MS_DIRSYNC, ",dirsync" },
@@ -6709,9 +6709,9 @@ diff -NurpP --minimal linux-3.5/fs/proc_namespace.c linux-3.5-vs2.3.4/fs/proc_na
  	/* file system type */
  	seq_puts(m, "with fstype ");
  	show_type(m, sb);
-diff -NurpP --minimal linux-3.5/fs/quota/dquot.c linux-3.5-vs2.3.4/fs/quota/dquot.c
---- linux-3.5/fs/quota/dquot.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/quota/dquot.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/quota/dquot.c linux-3.5.1-vs2.3.4.1/fs/quota/dquot.c
+--- linux-3.5.1/fs/quota/dquot.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/quota/dquot.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1562,6 +1562,9 @@ int __dquot_alloc_space(struct inode *in
  	struct dquot **dquots = inode->i_dquot;
  	int reserve = flags & DQUOT_SPACE_RESERVE;
@@ -6750,9 +6750,9 @@ diff -NurpP --minimal linux-3.5/fs/quota/dquot.c linux-3.5-vs2.3.4/fs/quota/dquo
  	/* 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.5/fs/quota/quota.c linux-3.5-vs2.3.4/fs/quota/quota.c
---- linux-3.5/fs/quota/quota.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/quota/quota.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/quota/quota.c linux-3.5.1-vs2.3.4.1/fs/quota/quota.c
+--- linux-3.5.1/fs/quota/quota.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/quota/quota.c	2012-07-23 01:45:55.000000000 +0200
 @@ -8,6 +8,7 @@
  #include <linux/fs.h>
  #include <linux/namei.h>
@@ -6840,9 +6840,9 @@ diff -NurpP --minimal linux-3.5/fs/quota/quota.c linux-3.5-vs2.3.4/fs/quota/quot
  	if (quotactl_cmd_write(cmd))
  		sb = get_super_thawed(bdev);
  	else
-diff -NurpP --minimal linux-3.5/fs/reiserfs/file.c linux-3.5-vs2.3.4/fs/reiserfs/file.c
---- linux-3.5/fs/reiserfs/file.c	2012-05-21 18:07:26.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/file.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/file.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/file.c
+--- linux-3.5.1/fs/reiserfs/file.c	2012-05-21 18:07:26.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/file.c	2012-07-23 01:45:55.000000000 +0200
 @@ -319,5 +319,6 @@ const struct inode_operations reiserfs_f
  	.listxattr = reiserfs_listxattr,
  	.removexattr = reiserfs_removexattr,
@@ -6850,9 +6850,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/file.c linux-3.5-vs2.3.4/fs/reiserfs
 +	.sync_flags = reiserfs_sync_flags,
  	.get_acl = reiserfs_get_acl,
  };
-diff -NurpP --minimal linux-3.5/fs/reiserfs/inode.c linux-3.5-vs2.3.4/fs/reiserfs/inode.c
---- linux-3.5/fs/reiserfs/inode.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/inode.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/inode.c
+--- linux-3.5.1/fs/reiserfs/inode.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/writeback.h>
  #include <linux/quotaops.h>
@@ -7018,9 +7018,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/inode.c linux-3.5-vs2.3.4/fs/reiserf
  		mark_inode_dirty(inode);
  		error = journal_end(&th, inode->i_sb, jbegin_count);
  		if (error)
-diff -NurpP --minimal linux-3.5/fs/reiserfs/ioctl.c linux-3.5-vs2.3.4/fs/reiserfs/ioctl.c
---- linux-3.5/fs/reiserfs/ioctl.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/ioctl.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/ioctl.c
+--- linux-3.5.1/fs/reiserfs/ioctl.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -11,6 +11,21 @@
  #include <linux/pagemap.h>
  #include <linux/compat.h>
@@ -7082,9 +7082,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/ioctl.c linux-3.5-vs2.3.4/fs/reiserf
  			sd_attrs_to_i_attrs(flags, inode);
  			REISERFS_I(inode)->i_attrs = flags;
  			inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.5/fs/reiserfs/namei.c linux-3.5-vs2.3.4/fs/reiserfs/namei.c
---- linux-3.5/fs/reiserfs/namei.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/namei.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/namei.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/namei.c
+--- linux-3.5.1/fs/reiserfs/namei.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/namei.c	2012-07-23 01:45:55.000000000 +0200
 @@ -18,6 +18,7 @@
  #include "acl.h"
  #include "xattr.h"
@@ -7101,9 +7101,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/namei.c linux-3.5-vs2.3.4/fs/reiserf
  
  	return d_splice_alias(inode, dentry);
  }
-diff -NurpP --minimal linux-3.5/fs/reiserfs/reiserfs.h linux-3.5-vs2.3.4/fs/reiserfs/reiserfs.h
---- linux-3.5/fs/reiserfs/reiserfs.h	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/reiserfs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/reiserfs.h linux-3.5.1-vs2.3.4.1/fs/reiserfs/reiserfs.h
+--- linux-3.5.1/fs/reiserfs/reiserfs.h	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/reiserfs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -549,6 +549,7 @@ enum reiserfs_mount_options {
  	REISERFS_EXPOSE_PRIVROOT,
  	REISERFS_BARRIER_NONE,
@@ -7142,9 +7142,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/reiserfs.h linux-3.5-vs2.3.4/fs/reis
  
  int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
  
-diff -NurpP --minimal linux-3.5/fs/reiserfs/super.c linux-3.5-vs2.3.4/fs/reiserfs/super.c
---- linux-3.5/fs/reiserfs/super.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/super.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/super.c
+--- linux-3.5.1/fs/reiserfs/super.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1013,6 +1013,14 @@ static int reiserfs_parse_options(struct
  		{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
  		{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -7186,9 +7186,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/super.c linux-3.5-vs2.3.4/fs/reiserf
  	rs = SB_DISK_SUPER_BLOCK(s);
  	/* Let's do basic sanity check to verify that underlying device is not
  	   smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.5/fs/reiserfs/xattr.c linux-3.5-vs2.3.4/fs/reiserfs/xattr.c
---- linux-3.5/fs/reiserfs/xattr.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/reiserfs/xattr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/reiserfs/xattr.c linux-3.5.1-vs2.3.4.1/fs/reiserfs/xattr.c
+--- linux-3.5.1/fs/reiserfs/xattr.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/reiserfs/xattr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/errno.h>
  #include <linux/gfp.h>
@@ -7197,9 +7197,9 @@ diff -NurpP --minimal linux-3.5/fs/reiserfs/xattr.c linux-3.5-vs2.3.4/fs/reiserf
  #include <linux/file.h>
  #include <linux/pagemap.h>
  #include <linux/xattr.h>
-diff -NurpP --minimal linux-3.5/fs/stat.c linux-3.5-vs2.3.4/fs/stat.c
---- linux-3.5/fs/stat.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/stat.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/stat.c linux-3.5.1-vs2.3.4.1/fs/stat.c
+--- linux-3.5.1/fs/stat.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/stat.c	2012-07-23 01:45:55.000000000 +0200
 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
  	stat->nlink = inode->i_nlink;
  	stat->uid = inode->i_uid;
@@ -7208,9 +7208,9 @@ diff -NurpP --minimal linux-3.5/fs/stat.c linux-3.5-vs2.3.4/fs/stat.c
  	stat->rdev = inode->i_rdev;
  	stat->size = i_size_read(inode);
  	stat->atime = inode->i_atime;
-diff -NurpP --minimal linux-3.5/fs/statfs.c linux-3.5-vs2.3.4/fs/statfs.c
---- linux-3.5/fs/statfs.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/statfs.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/statfs.c linux-3.5.1-vs2.3.4.1/fs/statfs.c
+--- linux-3.5.1/fs/statfs.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/statfs.c	2012-07-23 01:45:55.000000000 +0200
 @@ -7,6 +7,8 @@
  #include <linux/statfs.h>
  #include <linux/security.h>
@@ -7229,9 +7229,9 @@ diff -NurpP --minimal linux-3.5/fs/statfs.c linux-3.5-vs2.3.4/fs/statfs.c
  	return retval;
  }
  
-diff -NurpP --minimal linux-3.5/fs/super.c linux-3.5-vs2.3.4/fs/super.c
---- linux-3.5/fs/super.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/super.c linux-3.5.1-vs2.3.4.1/fs/super.c
+--- linux-3.5.1/fs/super.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -33,6 +33,8 @@
  #include <linux/rculist_bl.h>
  #include <linux/cleancache.h>
@@ -7255,9 +7255,9 @@ diff -NurpP --minimal linux-3.5/fs/super.c linux-3.5-vs2.3.4/fs/super.c
  	error = security_sb_kern_mount(sb, flags, secdata);
  	if (error)
  		goto out_sb;
-diff -NurpP --minimal linux-3.5/fs/sysfs/mount.c linux-3.5-vs2.3.4/fs/sysfs/mount.c
---- linux-3.5/fs/sysfs/mount.c	2012-05-21 18:07:27.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/sysfs/mount.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/sysfs/mount.c linux-3.5.1-vs2.3.4.1/fs/sysfs/mount.c
+--- linux-3.5.1/fs/sysfs/mount.c	2012-05-21 18:07:27.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/sysfs/mount.c	2012-07-23 01:45:55.000000000 +0200
 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
  
  	sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7267,9 +7267,9 @@ diff -NurpP --minimal linux-3.5/fs/sysfs/mount.c linux-3.5-vs2.3.4/fs/sysfs/moun
  	sb->s_op = &sysfs_ops;
  	sb->s_time_gran = 1;
  
-diff -NurpP --minimal linux-3.5/fs/utimes.c linux-3.5-vs2.3.4/fs/utimes.c
---- linux-3.5/fs/utimes.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/utimes.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/utimes.c linux-3.5.1-vs2.3.4.1/fs/utimes.c
+--- linux-3.5.1/fs/utimes.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/utimes.c	2012-07-23 01:45:55.000000000 +0200
 @@ -8,6 +8,8 @@
  #include <linux/stat.h>
  #include <linux/utime.h>
@@ -7299,9 +7299,9 @@ diff -NurpP --minimal linux-3.5/fs/utimes.c linux-3.5-vs2.3.4/fs/utimes.c
  	if (times && times[0].tv_nsec == UTIME_NOW &&
  		     times[1].tv_nsec == UTIME_NOW)
  		times = NULL;
-diff -NurpP --minimal linux-3.5/fs/xattr.c linux-3.5-vs2.3.4/fs/xattr.c
---- linux-3.5/fs/xattr.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xattr.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xattr.c linux-3.5.1-vs2.3.4.1/fs/xattr.c
+--- linux-3.5.1/fs/xattr.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xattr.c	2012-07-23 01:45:55.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/fsnotify.h>
  #include <linux/audit.h>
@@ -7319,9 +7319,9 @@ diff -NurpP --minimal linux-3.5/fs/xattr.c linux-3.5-vs2.3.4/fs/xattr.c
  			return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
  		return 0;
  	}
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_dinode.h linux-3.5-vs2.3.4/fs/xfs/xfs_dinode.h
---- linux-3.5/fs/xfs/xfs_dinode.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_dinode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_dinode.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_dinode.h
+--- linux-3.5.1/fs/xfs/xfs_dinode.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_dinode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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 */
@@ -7362,9 +7362,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_dinode.h linux-3.5-vs2.3.4/fs/xfs/xfs
 +#define XFS_DIVFLAG_COW		0x02
  
  #endif	/* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_fs.h linux-3.5-vs2.3.4/fs/xfs/xfs_fs.h
---- linux-3.5/fs/xfs/xfs_fs.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_fs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_fs.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_fs.h
+--- linux-3.5.1/fs/xfs/xfs_fs.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_fs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -67,6 +67,9 @@ struct fsxattr {
  #define XFS_XFLAG_EXTSZINHERIT	0x00001000	/* inherit inode extent size */
  #define XFS_XFLAG_NODEFRAG	0x00002000  	/* do not defragment */
@@ -7385,9 +7385,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_fs.h linux-3.5-vs2.3.4/fs/xfs/xfs_fs.
  	__u32		bs_dmevmask;	/* DMIG event mask		*/
  	__u16		bs_dmstate;	/* DMIG state info		*/
  	__u16		bs_aextents;	/* attribute number of extents	*/
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ialloc.c linux-3.5-vs2.3.4/fs/xfs/xfs_ialloc.c
---- linux-3.5/fs/xfs/xfs_ialloc.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_ialloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_ialloc.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ialloc.c
+--- linux-3.5.1/fs/xfs/xfs_ialloc.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ialloc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -37,7 +37,6 @@
  #include "xfs_error.h"
  #include "xfs_bmap.h"
@@ -7396,9 +7396,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ialloc.c linux-3.5-vs2.3.4/fs/xfs/xfs
  /*
   * Allocation group level functions.
   */
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_inode.c linux-3.5-vs2.3.4/fs/xfs/xfs_inode.c
---- linux-3.5/fs/xfs/xfs_inode.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_inode.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_inode.c
+--- linux-3.5.1/fs/xfs/xfs_inode.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -250,6 +250,7 @@ xfs_inotobp(
  	return 0;
  }
@@ -7573,9 +7573,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_inode.c linux-3.5-vs2.3.4/fs/xfs/xfs_
  
  	/* 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.5/fs/xfs/xfs_inode.h linux-3.5-vs2.3.4/fs/xfs/xfs_inode.h
---- linux-3.5/fs/xfs/xfs_inode.h	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_inode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_inode.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_inode.h
+--- linux-3.5.1/fs/xfs/xfs_inode.h	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_inode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -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 */
@@ -7596,9 +7596,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_inode.h linux-3.5-vs2.3.4/fs/xfs/xfs_
  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.5/fs/xfs/xfs_ioctl.c linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.c
---- linux-3.5/fs/xfs/xfs_ioctl.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_ioctl.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ioctl.c
+--- linux-3.5.1/fs/xfs/xfs_ioctl.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ioctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -26,7 +26,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -7667,9 +7667,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ioctl.c linux-3.5-vs2.3.4/fs/xfs/xfs_
  		return xfs_ioc_setxflags(ip, filp, arg);
  
  	case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ioctl.h linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.h
---- linux-3.5/fs/xfs/xfs_ioctl.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_ioctl.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_ioctl.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ioctl.h
+--- linux-3.5.1/fs/xfs/xfs_ioctl.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_ioctl.h	2012-07-23 01:45:55.000000000 +0200
 @@ -70,6 +70,12 @@ xfs_handle_to_dentry(
  	void __user		*uhandle,
  	u32			hlen);
@@ -7683,9 +7683,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_ioctl.h linux-3.5-vs2.3.4/fs/xfs/xfs_
  extern long
  xfs_file_ioctl(
  	struct file		*filp,
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_iops.c linux-3.5-vs2.3.4/fs/xfs/xfs_iops.c
---- linux-3.5/fs/xfs/xfs_iops.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_iops.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_iops.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_iops.c
+--- linux-3.5.1/fs/xfs/xfs_iops.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_iops.c	2012-07-23 01:45:55.000000000 +0200
 @@ -28,6 +28,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -7761,9 +7761,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_iops.c linux-3.5-vs2.3.4/fs/xfs/xfs_i
  
  	switch (inode->i_mode & S_IFMT) {
  	case S_IFBLK:
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_itable.c linux-3.5-vs2.3.4/fs/xfs/xfs_itable.c
---- linux-3.5/fs/xfs/xfs_itable.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_itable.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_itable.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_itable.c
+--- linux-3.5.1/fs/xfs/xfs_itable.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_itable.c	2012-07-23 01:45:55.000000000 +0200
 @@ -96,6 +96,7 @@ xfs_bulkstat_one_int(
  	buf->bs_mode = dic->di_mode;
  	buf->bs_uid = dic->di_uid;
@@ -7772,9 +7772,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_itable.c linux-3.5-vs2.3.4/fs/xfs/xfs
  	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.5/fs/xfs/xfs_linux.h linux-3.5-vs2.3.4/fs/xfs/xfs_linux.h
---- linux-3.5/fs/xfs/xfs_linux.h	2011-10-24 18:45:31.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_linux.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_linux.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_linux.h
+--- linux-3.5.1/fs/xfs/xfs_linux.h	2011-10-24 18:45:31.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_linux.h	2012-07-23 01:45:55.000000000 +0200
 @@ -121,6 +121,7 @@
  
  #define current_cpu()		(raw_smp_processor_id())
@@ -7783,9 +7783,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_linux.h linux-3.5-vs2.3.4/fs/xfs/xfs_
  #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.5/fs/xfs/xfs_log_recover.c linux-3.5-vs2.3.4/fs/xfs/xfs_log_recover.c
---- linux-3.5/fs/xfs/xfs_log_recover.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_log_recover.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_log_recover.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_log_recover.c
+--- linux-3.5.1/fs/xfs/xfs_log_recover.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_log_recover.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2351,7 +2351,8 @@ xlog_recover_inode_pass2(
  	}
  
@@ -7796,9 +7796,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_log_recover.c linux-3.5-vs2.3.4/fs/xf
  
  	/* the rest is in on-disk format */
  	if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_mount.h linux-3.5-vs2.3.4/fs/xfs/xfs_mount.h
---- linux-3.5/fs/xfs/xfs_mount.h	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_mount.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_mount.h linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_mount.h
+--- linux-3.5.1/fs/xfs/xfs_mount.h	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_mount.h	2012-07-23 01:45:55.000000000 +0200
 @@ -252,6 +252,7 @@ typedef struct xfs_mount {
  						   allocator */
  #define XFS_MOUNT_NOATTR2	(1ULL << 25)	/* disable use of attr2 format */
@@ -7807,9 +7807,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_mount.h linux-3.5-vs2.3.4/fs/xfs/xfs_
  
  /*
   * Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.5/fs/xfs/xfs_super.c linux-3.5-vs2.3.4/fs/xfs/xfs_super.c
---- linux-3.5/fs/xfs/xfs_super.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_super.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_super.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_super.c
+--- linux-3.5.1/fs/xfs/xfs_super.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_super.c	2012-07-23 01:45:55.000000000 +0200
 @@ -112,6 +112,9 @@ mempool_t *xfs_ioend_pool;
  #define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */
  #define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */
@@ -7882,9 +7882,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_super.c linux-3.5-vs2.3.4/fs/xfs/xfs_
  	/*
  	 * 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.5/fs/xfs/xfs_vnodeops.c linux-3.5-vs2.3.4/fs/xfs/xfs_vnodeops.c
---- linux-3.5/fs/xfs/xfs_vnodeops.c	2012-07-22 23:39:42.000000000 +0200
-+++ linux-3.5-vs2.3.4/fs/xfs/xfs_vnodeops.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/fs/xfs/xfs_vnodeops.c linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_vnodeops.c
+--- linux-3.5.1/fs/xfs/xfs_vnodeops.c	2012-07-22 23:39:42.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/fs/xfs/xfs_vnodeops.c	2012-07-23 01:45:55.000000000 +0200
 @@ -103,6 +103,77 @@ xfs_readlink_bmap(
  	return error;
  }
@@ -7963,9 +7963,9 @@ diff -NurpP --minimal linux-3.5/fs/xfs/xfs_vnodeops.c linux-3.5-vs2.3.4/fs/xfs/x
  int
  xfs_readlink(
  	xfs_inode_t     *ip,
-diff -NurpP --minimal linux-3.5/include/linux/Kbuild linux-3.5-vs2.3.4/include/linux/Kbuild
---- linux-3.5/include/linux/Kbuild	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/Kbuild	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/Kbuild linux-3.5.1-vs2.3.4.1/include/linux/Kbuild
+--- linux-3.5.1/include/linux/Kbuild	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/Kbuild	2012-07-23 01:45:55.000000000 +0200
 @@ -18,6 +18,7 @@ header-y += netfilter_bridge/
  header-y += netfilter_ipv4/
  header-y += netfilter_ipv6/
@@ -7974,9 +7974,9 @@ diff -NurpP --minimal linux-3.5/include/linux/Kbuild linux-3.5-vs2.3.4/include/l
  header-y += wimax/
  
  objhdr-y += version.h
-diff -NurpP --minimal linux-3.5/include/linux/capability.h linux-3.5-vs2.3.4/include/linux/capability.h
---- linux-3.5/include/linux/capability.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/capability.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/capability.h linux-3.5.1-vs2.3.4.1/include/linux/capability.h
+--- linux-3.5.1/include/linux/capability.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/capability.h	2012-07-23 01:45:55.000000000 +0200
 @@ -280,6 +280,7 @@ struct cpu_vfs_cap_data {
     arbitrary SCSI commands */
  /* Allow setting encryption key on loopback filesystem */
@@ -7999,9 +7999,9 @@ diff -NurpP --minimal linux-3.5/include/linux/capability.h linux-3.5-vs2.3.4/inc
  
  /*
   * Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.5/include/linux/cred.h linux-3.5-vs2.3.4/include/linux/cred.h
---- linux-3.5/include/linux/cred.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/cred.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/cred.h linux-3.5.1-vs2.3.4.1/include/linux/cred.h
+--- linux-3.5.1/include/linux/cred.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/cred.h	2012-07-23 01:45:55.000000000 +0200
 @@ -157,6 +157,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 *);
@@ -8042,18 +8042,18 @@ diff -NurpP --minimal linux-3.5/include/linux/cred.h linux-3.5-vs2.3.4/include/l
  /**
   * get_new_cred - Get a reference on a new set of credentials
   * @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.5/include/linux/devpts_fs.h linux-3.5-vs2.3.4/include/linux/devpts_fs.h
---- linux-3.5/include/linux/devpts_fs.h	2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/devpts_fs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/devpts_fs.h linux-3.5.1-vs2.3.4.1/include/linux/devpts_fs.h
+--- linux-3.5.1/include/linux/devpts_fs.h	2008-12-25 00:26:37.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/devpts_fs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
  
  #endif
  
 -
  #endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.5/include/linux/fs.h linux-3.5-vs2.3.4/include/linux/fs.h
---- linux-3.5/include/linux/fs.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/fs.h	2012-07-23 10:22:46.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/fs.h linux-3.5.1-vs2.3.4.1/include/linux/fs.h
+--- linux-3.5.1/include/linux/fs.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/fs.h	2012-07-23 10:22:46.000000000 +0200
 @@ -223,6 +223,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 */
@@ -8231,9 +8231,9 @@ diff -NurpP --minimal linux-3.5/include/linux/fs.h linux-3.5-vs2.3.4/include/lin
  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.5/include/linux/gfs2_ondisk.h linux-3.5-vs2.3.4/include/linux/gfs2_ondisk.h
---- linux-3.5/include/linux/gfs2_ondisk.h	2012-05-21 18:07:29.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/gfs2_ondisk.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/gfs2_ondisk.h linux-3.5.1-vs2.3.4.1/include/linux/gfs2_ondisk.h
+--- linux-3.5.1/include/linux/gfs2_ondisk.h	2012-05-21 18:07:29.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/gfs2_ondisk.h	2012-07-23 01:45:55.000000000 +0200
 @@ -214,6 +214,9 @@ enum {
  	gfs2fl_NoAtime		= 7,
  	gfs2fl_Sync		= 8,
@@ -8254,9 +8254,9 @@ diff -NurpP --minimal linux-3.5/include/linux/gfs2_ondisk.h linux-3.5-vs2.3.4/in
  #define GFS2_DIF_TRUNC_IN_PROG		0x20000000 /* New in gfs2 */
  #define GFS2_DIF_INHERIT_DIRECTIO	0x40000000
  #define GFS2_DIF_INHERIT_JDATA		0x80000000
-diff -NurpP --minimal linux-3.5/include/linux/if_tun.h linux-3.5-vs2.3.4/include/linux/if_tun.h
---- linux-3.5/include/linux/if_tun.h	2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/if_tun.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/if_tun.h linux-3.5.1-vs2.3.4.1/include/linux/if_tun.h
+--- linux-3.5.1/include/linux/if_tun.h	2010-08-02 16:52:54.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/if_tun.h	2012-07-23 01:45:55.000000000 +0200
 @@ -53,6 +53,7 @@
  #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
  #define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -8265,9 +8265,9 @@ diff -NurpP --minimal linux-3.5/include/linux/if_tun.h linux-3.5-vs2.3.4/include
  
  /* TUNSETIFF ifr flags */
  #define IFF_TUN		0x0001
-diff -NurpP --minimal linux-3.5/include/linux/init_task.h linux-3.5-vs2.3.4/include/linux/init_task.h
---- linux-3.5/include/linux/init_task.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/init_task.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/init_task.h linux-3.5.1-vs2.3.4.1/include/linux/init_task.h
+--- linux-3.5.1/include/linux/init_task.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/init_task.h	2012-07-23 01:45:55.000000000 +0200
 @@ -200,6 +200,10 @@ extern struct cred init_cred;
  	INIT_TRACE_RECURSION						\
  	INIT_TASK_RCU_PREEMPT(tsk)					\
@@ -8279,9 +8279,9 @@ diff -NurpP --minimal linux-3.5/include/linux/init_task.h linux-3.5-vs2.3.4/incl
  }
  
  
-diff -NurpP --minimal linux-3.5/include/linux/ipc.h linux-3.5-vs2.3.4/include/linux/ipc.h
---- linux-3.5/include/linux/ipc.h	2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/ipc.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/ipc.h linux-3.5.1-vs2.3.4.1/include/linux/ipc.h
+--- linux-3.5.1/include/linux/ipc.h	2012-03-19 19:47:28.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/ipc.h	2012-07-23 01:45:55.000000000 +0200
 @@ -91,6 +91,7 @@ struct kern_ipc_perm
  	key_t		key;
  	uid_t		uid;
@@ -8290,9 +8290,9 @@ diff -NurpP --minimal linux-3.5/include/linux/ipc.h linux-3.5-vs2.3.4/include/li
  	uid_t		cuid;
  	gid_t		cgid;
  	umode_t		mode; 
-diff -NurpP --minimal linux-3.5/include/linux/ipc_namespace.h linux-3.5-vs2.3.4/include/linux/ipc_namespace.h
---- linux-3.5/include/linux/ipc_namespace.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/ipc_namespace.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/ipc_namespace.h linux-3.5.1-vs2.3.4.1/include/linux/ipc_namespace.h
+--- linux-3.5.1/include/linux/ipc_namespace.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/ipc_namespace.h	2012-07-23 01:45:55.000000000 +0200
 @@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_
  
  #if defined(CONFIG_IPC_NS)
@@ -8319,9 +8319,9 @@ diff -NurpP --minimal linux-3.5/include/linux/ipc_namespace.h linux-3.5-vs2.3.4/
  }
  
  static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.5/include/linux/loop.h linux-3.5-vs2.3.4/include/linux/loop.h
---- linux-3.5/include/linux/loop.h	2012-01-09 16:14:58.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/loop.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/loop.h linux-3.5.1-vs2.3.4.1/include/linux/loop.h
+--- linux-3.5.1/include/linux/loop.h	2012-01-09 16:14:58.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/loop.h	2012-07-23 01:45:55.000000000 +0200
 @@ -45,6 +45,7 @@ struct loop_device {
  	struct loop_func_table *lo_encryption;
  	__u32           lo_init[2];
@@ -8330,9 +8330,9 @@ diff -NurpP --minimal linux-3.5/include/linux/loop.h linux-3.5-vs2.3.4/include/l
  	int		(*ioctl)(struct loop_device *, int cmd, 
  				 unsigned long arg); 
  
-diff -NurpP --minimal linux-3.5/include/linux/magic.h linux-3.5-vs2.3.4/include/linux/magic.h
---- linux-3.5/include/linux/magic.h	2012-05-21 18:07:31.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/magic.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/magic.h linux-3.5.1-vs2.3.4.1/include/linux/magic.h
+--- linux-3.5.1/include/linux/magic.h	2012-05-21 18:07:31.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/magic.h	2012-07-23 01:45:55.000000000 +0200
 @@ -3,7 +3,7 @@
  
  #define ADFS_SUPER_MAGIC	0xadf5
@@ -8342,9 +8342,9 @@ diff -NurpP --minimal linux-3.5/include/linux/magic.h linux-3.5-vs2.3.4/include/
  #define AUTOFS_SUPER_MAGIC	0x0187
  #define CODA_SUPER_MAGIC	0x73757245
  #define CRAMFS_MAGIC		0x28cd3d45	/* some random number */
-diff -NurpP --minimal linux-3.5/include/linux/major.h linux-3.5-vs2.3.4/include/linux/major.h
---- linux-3.5/include/linux/major.h	2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/major.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/major.h linux-3.5.1-vs2.3.4.1/include/linux/major.h
+--- linux-3.5.1/include/linux/major.h	2009-09-10 15:26:25.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/major.h	2012-07-23 01:45:55.000000000 +0200
 @@ -15,6 +15,7 @@
  #define HD_MAJOR		IDE0_MAJOR
  #define PTY_SLAVE_MAJOR		3
@@ -8353,9 +8353,9 @@ diff -NurpP --minimal linux-3.5/include/linux/major.h linux-3.5-vs2.3.4/include/
  #define TTYAUX_MAJOR		5
  #define LP_MAJOR		6
  #define VCS_MAJOR		7
-diff -NurpP --minimal linux-3.5/include/linux/memcontrol.h linux-3.5-vs2.3.4/include/linux/memcontrol.h
---- linux-3.5/include/linux/memcontrol.h	2012-07-22 23:39:43.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/memcontrol.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/memcontrol.h linux-3.5.1-vs2.3.4.1/include/linux/memcontrol.h
+--- linux-3.5.1/include/linux/memcontrol.h	2012-07-22 23:39:43.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/memcontrol.h	2012-07-23 01:45:55.000000000 +0200
 @@ -85,6 +85,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);
@@ -8370,9 +8370,9 @@ diff -NurpP --minimal linux-3.5/include/linux/memcontrol.h linux-3.5-vs2.3.4/inc
  static inline
  int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
  {
-diff -NurpP --minimal linux-3.5/include/linux/mm_types.h linux-3.5-vs2.3.4/include/linux/mm_types.h
---- linux-3.5/include/linux/mm_types.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/mm_types.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/mm_types.h linux-3.5.1-vs2.3.4.1/include/linux/mm_types.h
+--- linux-3.5.1/include/linux/mm_types.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/mm_types.h	2012-07-23 01:45:55.000000000 +0200
 @@ -354,6 +354,7 @@ struct mm_struct {
  
  	/* Architecture-specific MM context */
@@ -8381,9 +8381,9 @@ diff -NurpP --minimal linux-3.5/include/linux/mm_types.h linux-3.5-vs2.3.4/inclu
  
  	unsigned long flags; /* Must use atomic bitops to access the bits */
  
-diff -NurpP --minimal linux-3.5/include/linux/mmzone.h linux-3.5-vs2.3.4/include/linux/mmzone.h
---- linux-3.5/include/linux/mmzone.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/mmzone.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/mmzone.h linux-3.5.1-vs2.3.4.1/include/linux/mmzone.h
+--- linux-3.5.1/include/linux/mmzone.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/mmzone.h	2012-07-23 01:45:55.000000000 +0200
 @@ -715,6 +715,13 @@ typedef struct pglist_data {
  	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
  })
@@ -8398,9 +8398,9 @@ diff -NurpP --minimal linux-3.5/include/linux/mmzone.h linux-3.5-vs2.3.4/include
  #include <linux/memory_hotplug.h>
  
  extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.5/include/linux/mount.h linux-3.5-vs2.3.4/include/linux/mount.h
---- linux-3.5/include/linux/mount.h	2012-03-19 19:47:28.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/mount.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/mount.h linux-3.5.1-vs2.3.4.1/include/linux/mount.h
+--- linux-3.5.1/include/linux/mount.h	2012-03-19 19:47:28.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/mount.h	2012-07-23 01:45:55.000000000 +0200
 @@ -47,6 +47,9 @@ struct mnt_namespace;
  
  #define MNT_INTERNAL	0x4000
@@ -8411,10 +8411,10 @@ diff -NurpP --minimal linux-3.5/include/linux/mount.h linux-3.5-vs2.3.4/include/
  struct vfsmount {
  	struct dentry *mnt_root;	/* root of the mounted tree */
  	struct super_block *mnt_sb;	/* pointer to superblock */
-diff -NurpP --minimal linux-3.5/include/linux/net.h linux-3.5-vs2.3.4/include/linux/net.h
---- linux-3.5/include/linux/net.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/net.h	2012-07-23 01:45:55.000000000 +0200
-@@ -72,6 +72,7 @@ struct net;
+diff -NurpP --minimal linux-3.5.1/include/linux/net.h linux-3.5.1-vs2.3.4.1/include/linux/net.h
+--- linux-3.5.1/include/linux/net.h	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/net.h	2012-08-11 15:16:09.000000000 +0200
+@@ -73,6 +73,7 @@ struct net;
  #define SOCK_PASSCRED		3
  #define SOCK_PASSSEC		4
  #define SOCK_EXTERNALLY_ALLOCATED 5
@@ -8422,9 +8422,9 @@ diff -NurpP --minimal linux-3.5/include/linux/net.h linux-3.5-vs2.3.4/include/li
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**
-diff -NurpP --minimal linux-3.5/include/linux/netdevice.h linux-3.5-vs2.3.4/include/linux/netdevice.h
---- linux-3.5/include/linux/netdevice.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/netdevice.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/netdevice.h linux-3.5.1-vs2.3.4.1/include/linux/netdevice.h
+--- linux-3.5.1/include/linux/netdevice.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/netdevice.h	2012-07-23 01:45:55.000000000 +0200
 @@ -1644,6 +1644,7 @@ extern void		netdev_resync_ops(struct ne
  
  extern struct net_device	*dev_get_by_index(struct net *net, int ifindex);
@@ -8433,9 +8433,9 @@ diff -NurpP --minimal linux-3.5/include/linux/netdevice.h linux-3.5-vs2.3.4/incl
  extern struct net_device	*dev_get_by_index_rcu(struct net *net, int ifindex);
  extern int		dev_restart(struct net_device *dev);
  #ifdef CONFIG_NETPOLL_TRAP
-diff -NurpP --minimal linux-3.5/include/linux/nfs_mount.h linux-3.5-vs2.3.4/include/linux/nfs_mount.h
---- linux-3.5/include/linux/nfs_mount.h	2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/nfs_mount.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/nfs_mount.h linux-3.5.1-vs2.3.4.1/include/linux/nfs_mount.h
+--- linux-3.5.1/include/linux/nfs_mount.h	2011-01-05 21:50:31.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/nfs_mount.h	2012-07-23 01:45:55.000000000 +0200
 @@ -63,7 +63,8 @@ struct nfs_mount_data {
  #define NFS_MOUNT_SECFLAVOUR	0x2000	/* 5 */
  #define NFS_MOUNT_NORDIRPLUS	0x4000	/* 5 */
@@ -8446,9 +8446,9 @@ diff -NurpP --minimal linux-3.5/include/linux/nfs_mount.h linux-3.5-vs2.3.4/incl
  
  /* The following are for internal use only */
  #define NFS_MOUNT_LOOKUP_CACHE_NONEG	0x10000
-diff -NurpP --minimal linux-3.5/include/linux/nsproxy.h linux-3.5-vs2.3.4/include/linux/nsproxy.h
---- linux-3.5/include/linux/nsproxy.h	2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/nsproxy.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/nsproxy.h linux-3.5.1-vs2.3.4.1/include/linux/nsproxy.h
+--- linux-3.5.1/include/linux/nsproxy.h	2011-10-24 18:45:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/nsproxy.h	2012-07-23 01:45:55.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/spinlock.h>
@@ -8498,9 +8498,9 @@ diff -NurpP --minimal linux-3.5/include/linux/nsproxy.h linux-3.5-vs2.3.4/includ
  }
  
  #endif
-diff -NurpP --minimal linux-3.5/include/linux/pid.h linux-3.5-vs2.3.4/include/linux/pid.h
---- linux-3.5/include/linux/pid.h	2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/pid.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/pid.h linux-3.5.1-vs2.3.4.1/include/linux/pid.h
+--- linux-3.5.1/include/linux/pid.h	2011-07-22 11:18:11.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/pid.h	2012-07-23 01:45:55.000000000 +0200
 @@ -8,7 +8,8 @@ enum pid_type
  	PIDTYPE_PID,
  	PIDTYPE_PGID,
@@ -8519,9 +8519,9 @@ diff -NurpP --minimal linux-3.5/include/linux/pid.h linux-3.5-vs2.3.4/include/li
  pid_t pid_vnr(struct pid *pid);
  
  #define do_each_pid_task(pid, type, task)				\
-diff -NurpP --minimal linux-3.5/include/linux/proc_fs.h linux-3.5-vs2.3.4/include/linux/proc_fs.h
---- linux-3.5/include/linux/proc_fs.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/proc_fs.h	2012-07-23 10:20:57.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/proc_fs.h linux-3.5.1-vs2.3.4.1/include/linux/proc_fs.h
+--- linux-3.5.1/include/linux/proc_fs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/proc_fs.h	2012-07-23 10:20:57.000000000 +0200
 @@ -54,6 +54,7 @@ struct proc_dir_entry {
  	nlink_t nlink;
  	kuid_t uid;
@@ -8557,9 +8557,9 @@ diff -NurpP --minimal linux-3.5/include/linux/proc_fs.h linux-3.5-vs2.3.4/includ
  	int fd;
  	union proc_op op;
  	struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.5/include/linux/quotaops.h linux-3.5-vs2.3.4/include/linux/quotaops.h
---- linux-3.5/include/linux/quotaops.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/quotaops.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/quotaops.h linux-3.5.1-vs2.3.4.1/include/linux/quotaops.h
+--- linux-3.5.1/include/linux/quotaops.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/quotaops.h	2012-07-23 01:45:55.000000000 +0200
 @@ -8,6 +8,7 @@
  #define _LINUX_QUOTAOPS_
  
@@ -8601,9 +8601,9 @@ diff -NurpP --minimal linux-3.5/include/linux/quotaops.h linux-3.5-vs2.3.4/inclu
  }
  
  static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.5/include/linux/reboot.h linux-3.5-vs2.3.4/include/linux/reboot.h
---- linux-3.5/include/linux/reboot.h	2011-10-24 18:45:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/reboot.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/reboot.h linux-3.5.1-vs2.3.4.1/include/linux/reboot.h
+--- linux-3.5.1/include/linux/reboot.h	2011-10-24 18:45:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/reboot.h	2012-07-23 01:45:55.000000000 +0200
 @@ -33,6 +33,7 @@
  #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
  #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
@@ -8612,9 +8612,9 @@ diff -NurpP --minimal linux-3.5/include/linux/reboot.h linux-3.5-vs2.3.4/include
  
  
  #ifdef __KERNEL__
-diff -NurpP --minimal linux-3.5/include/linux/sched.h linux-3.5-vs2.3.4/include/linux/sched.h
---- linux-3.5/include/linux/sched.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/sched.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/sched.h linux-3.5.1-vs2.3.4.1/include/linux/sched.h
+--- linux-3.5.1/include/linux/sched.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/sched.h	2012-07-23 01:45:55.000000000 +0200
 @@ -1414,6 +1414,14 @@ struct task_struct {
  #endif
  	struct seccomp seccomp;
@@ -8661,9 +8661,9 @@ diff -NurpP --minimal linux-3.5/include/linux/sched.h linux-3.5-vs2.3.4/include/
  }
  
  
-diff -NurpP --minimal linux-3.5/include/linux/shmem_fs.h linux-3.5-vs2.3.4/include/linux/shmem_fs.h
---- linux-3.5/include/linux/shmem_fs.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/shmem_fs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/shmem_fs.h linux-3.5.1-vs2.3.4.1/include/linux/shmem_fs.h
+--- linux-3.5.1/include/linux/shmem_fs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/shmem_fs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -8,6 +8,9 @@
  
  /* inode in-kernel data */
@@ -8674,9 +8674,9 @@ diff -NurpP --minimal linux-3.5/include/linux/shmem_fs.h linux-3.5-vs2.3.4/inclu
  struct shmem_inode_info {
  	spinlock_t		lock;
  	unsigned long		flags;
-diff -NurpP --minimal linux-3.5/include/linux/stat.h linux-3.5-vs2.3.4/include/linux/stat.h
---- linux-3.5/include/linux/stat.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/stat.h	2012-07-23 10:23:18.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/stat.h linux-3.5.1-vs2.3.4.1/include/linux/stat.h
+--- linux-3.5.1/include/linux/stat.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/stat.h	2012-07-23 10:23:18.000000000 +0200
 @@ -67,6 +67,7 @@ struct kstat {
  	unsigned int	nlink;
  	kuid_t		uid;
@@ -8685,9 +8685,9 @@ diff -NurpP --minimal linux-3.5/include/linux/stat.h linux-3.5-vs2.3.4/include/l
  	dev_t		rdev;
  	loff_t		size;
  	struct timespec  atime;
-diff -NurpP --minimal linux-3.5/include/linux/sunrpc/auth.h linux-3.5-vs2.3.4/include/linux/sunrpc/auth.h
---- linux-3.5/include/linux/sunrpc/auth.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/sunrpc/auth.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/sunrpc/auth.h linux-3.5.1-vs2.3.4.1/include/linux/sunrpc/auth.h
+--- linux-3.5.1/include/linux/sunrpc/auth.h	2012-05-21 18:07:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/sunrpc/auth.h	2012-07-23 01:45:55.000000000 +0200
 @@ -25,6 +25,7 @@
  struct auth_cred {
  	uid_t	uid;
@@ -8696,9 +8696,9 @@ diff -NurpP --minimal linux-3.5/include/linux/sunrpc/auth.h linux-3.5-vs2.3.4/in
  	struct group_info *group_info;
  	const char *principal;
  	unsigned char machine_cred : 1;
-diff -NurpP --minimal linux-3.5/include/linux/sunrpc/clnt.h linux-3.5-vs2.3.4/include/linux/sunrpc/clnt.h
---- linux-3.5/include/linux/sunrpc/clnt.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/sunrpc/clnt.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/sunrpc/clnt.h linux-3.5.1-vs2.3.4.1/include/linux/sunrpc/clnt.h
+--- linux-3.5.1/include/linux/sunrpc/clnt.h	2012-05-21 18:07:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/sunrpc/clnt.h	2012-07-23 01:45:55.000000000 +0200
 @@ -49,7 +49,8 @@ struct rpc_clnt {
  	unsigned int		cl_softrtry : 1,/* soft timeouts */
  				cl_discrtry : 1,/* disconnect before retry */
@@ -8709,9 +8709,9 @@ diff -NurpP --minimal linux-3.5/include/linux/sunrpc/clnt.h linux-3.5-vs2.3.4/in
  
  	struct rpc_rtt *	cl_rtt;		/* RTO estimator data */
  	const struct rpc_timeout *cl_timeout;	/* Timeout strategy */
-diff -NurpP --minimal linux-3.5/include/linux/sysctl.h linux-3.5-vs2.3.4/include/linux/sysctl.h
---- linux-3.5/include/linux/sysctl.h	2012-05-21 18:07:32.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/sysctl.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/sysctl.h linux-3.5.1-vs2.3.4.1/include/linux/sysctl.h
+--- linux-3.5.1/include/linux/sysctl.h	2012-05-21 18:07:32.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/sysctl.h	2012-07-23 01:45:55.000000000 +0200
 @@ -60,6 +60,7 @@ enum
  	CTL_ABI=9,		/* Binary emulation */
  	CTL_CPU=10,		/* CPU stuff (speed scaling, etc) */
@@ -8728,9 +8728,9 @@ diff -NurpP --minimal linux-3.5/include/linux/sysctl.h linux-3.5-vs2.3.4/include
  
  	KERN_SPARC_REBOOT=21,	/* reboot command on Sparc */
  	KERN_CTLALTDEL=22,	/* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.5/include/linux/sysfs.h linux-3.5-vs2.3.4/include/linux/sysfs.h
---- linux-3.5/include/linux/sysfs.h	2012-07-22 23:39:44.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/sysfs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/sysfs.h linux-3.5.1-vs2.3.4.1/include/linux/sysfs.h
+--- linux-3.5.1/include/linux/sysfs.h	2012-07-22 23:39:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/sysfs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -19,6 +19,8 @@
  #include <linux/kobject_ns.h>
  #include <linux/atomic.h>
@@ -8740,9 +8740,9 @@ diff -NurpP --minimal linux-3.5/include/linux/sysfs.h linux-3.5-vs2.3.4/include/
  struct kobject;
  struct module;
  enum kobj_ns_type;
-diff -NurpP --minimal linux-3.5/include/linux/time.h linux-3.5-vs2.3.4/include/linux/time.h
---- linux-3.5/include/linux/time.h	2012-07-22 23:39:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/time.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/time.h linux-3.5.1-vs2.3.4.1/include/linux/time.h
+--- linux-3.5.1/include/linux/time.h	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/time.h	2012-08-11 15:15:02.000000000 +0200
 @@ -255,6 +255,8 @@ static __always_inline void timespec_add
  	a->tv_nsec = ns;
  }
@@ -8751,10 +8751,10 @@ diff -NurpP --minimal linux-3.5/include/linux/time.h linux-3.5-vs2.3.4/include/l
 +
  #endif /* __KERNEL__ */
  
- #define NFDBITS			__NFDBITS
-diff -NurpP --minimal linux-3.5/include/linux/types.h linux-3.5-vs2.3.4/include/linux/types.h
---- linux-3.5/include/linux/types.h	2012-07-22 23:39:45.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/linux/types.h	2012-07-23 01:45:55.000000000 +0200
+ /*
+diff -NurpP --minimal linux-3.5.1/include/linux/types.h linux-3.5.1-vs2.3.4.1/include/linux/types.h
+--- linux-3.5.1/include/linux/types.h	2012-07-22 23:39:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/linux/types.h	2012-07-23 01:45:55.000000000 +0200
 @@ -41,6 +41,9 @@ typedef __kernel_uid32_t	uid_t;
  typedef __kernel_gid32_t	gid_t;
  typedef __kernel_uid16_t        uid16_t;
@@ -8765,9 +8765,9 @@ diff -NurpP --minimal linux-3.5/include/linux/types.h linux-3.5-vs2.3.4/include/
  
  typedef unsigned long		uintptr_t;
  
-diff -NurpP --minimal linux-3.5/include/linux/utsname.h linux-3.5-vs2.3.4/include/linux/utsname.h
---- linux-3.5/include/linux/utsname.h	2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/utsname.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/utsname.h linux-3.5.1-vs2.3.4.1/include/linux/utsname.h
+--- linux-3.5.1/include/linux/utsname.h	2012-01-09 16:14:59.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/utsname.h	2012-07-23 01:45:55.000000000 +0200
 @@ -62,7 +62,8 @@ static inline void get_uts_ns(struct uts
  }
  
@@ -8794,9 +8794,9 @@ diff -NurpP --minimal linux-3.5/include/linux/utsname.h linux-3.5-vs2.3.4/includ
  }
  #endif
  
-diff -NurpP --minimal linux-3.5/include/linux/vroot.h linux-3.5-vs2.3.4/include/linux/vroot.h
---- linux-3.5/include/linux/vroot.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vroot.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vroot.h linux-3.5.1-vs2.3.4.1/include/linux/vroot.h
+--- linux-3.5.1/include/linux/vroot.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vroot.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,51 @@
 +
 +/*
@@ -8849,9 +8849,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vroot.h linux-3.5-vs2.3.4/include/
 +#define VROOT_CLR_DEV		0x5601
 +
 +#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vs_base.h linux-3.5-vs2.3.4/include/linux/vs_base.h
---- linux-3.5/include/linux/vs_base.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_base.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_base.h linux-3.5.1-vs2.3.4.1/include/linux/vs_base.h
+--- linux-3.5.1/include/linux/vs_base.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_base.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,10 @@
 +#ifndef _VS_BASE_H
 +#define _VS_BASE_H
@@ -8863,9 +8863,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_base.h linux-3.5-vs2.3.4/includ
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_context.h linux-3.5-vs2.3.4/include/linux/vs_context.h
---- linux-3.5/include/linux/vs_context.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_context.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_context.h linux-3.5.1-vs2.3.4.1/include/linux/vs_context.h
+--- linux-3.5.1/include/linux/vs_context.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_context.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,242 @@
 +#ifndef _VS_CONTEXT_H
 +#define _VS_CONTEXT_H
@@ -9109,9 +9109,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_context.h linux-3.5-vs2.3.4/inc
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_cowbl.h linux-3.5-vs2.3.4/include/linux/vs_cowbl.h
---- linux-3.5/include/linux/vs_cowbl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_cowbl.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_cowbl.h linux-3.5.1-vs2.3.4.1/include/linux/vs_cowbl.h
+--- linux-3.5.1/include/linux/vs_cowbl.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_cowbl.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,48 @@
 +#ifndef _VS_COWBL_H
 +#define _VS_COWBL_H
@@ -9161,9 +9161,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_cowbl.h linux-3.5-vs2.3.4/inclu
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_cvirt.h linux-3.5-vs2.3.4/include/linux/vs_cvirt.h
---- linux-3.5/include/linux/vs_cvirt.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_cvirt.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_cvirt.h linux-3.5.1-vs2.3.4.1/include/linux/vs_cvirt.h
+--- linux-3.5.1/include/linux/vs_cvirt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_cvirt.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_CVIRT_H
 +#define _VS_CVIRT_H
@@ -9215,9 +9215,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_cvirt.h linux-3.5-vs2.3.4/inclu
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_device.h linux-3.5-vs2.3.4/include/linux/vs_device.h
---- linux-3.5/include/linux/vs_device.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_device.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_device.h linux-3.5.1-vs2.3.4.1/include/linux/vs_device.h
+--- linux-3.5.1/include/linux/vs_device.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_device.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,45 @@
 +#ifndef _VS_DEVICE_H
 +#define _VS_DEVICE_H
@@ -9264,9 +9264,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_device.h linux-3.5-vs2.3.4/incl
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_dlimit.h linux-3.5-vs2.3.4/include/linux/vs_dlimit.h
---- linux-3.5/include/linux/vs_dlimit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_dlimit.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_dlimit.h linux-3.5.1-vs2.3.4.1/include/linux/vs_dlimit.h
+--- linux-3.5.1/include/linux/vs_dlimit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_dlimit.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,215 @@
 +#ifndef _VS_DLIMIT_H
 +#define _VS_DLIMIT_H
@@ -9483,9 +9483,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_dlimit.h linux-3.5-vs2.3.4/incl
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_inet.h linux-3.5-vs2.3.4/include/linux/vs_inet.h
---- linux-3.5/include/linux/vs_inet.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_inet.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_inet.h linux-3.5.1-vs2.3.4.1/include/linux/vs_inet.h
+--- linux-3.5.1/include/linux/vs_inet.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_inet.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,353 @@
 +#ifndef _VS_INET_H
 +#define _VS_INET_H
@@ -9840,9 +9840,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_inet.h linux-3.5-vs2.3.4/includ
 +#else
 +// #warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_inet6.h linux-3.5-vs2.3.4/include/linux/vs_inet6.h
---- linux-3.5/include/linux/vs_inet6.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_inet6.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_inet6.h linux-3.5.1-vs2.3.4.1/include/linux/vs_inet6.h
+--- linux-3.5.1/include/linux/vs_inet6.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_inet6.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,246 @@
 +#ifndef _VS_INET6_H
 +#define _VS_INET6_H
@@ -10090,9 +10090,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_inet6.h linux-3.5-vs2.3.4/inclu
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_limit.h linux-3.5-vs2.3.4/include/linux/vs_limit.h
---- linux-3.5/include/linux/vs_limit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_limit.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_limit.h linux-3.5.1-vs2.3.4.1/include/linux/vs_limit.h
+--- linux-3.5.1/include/linux/vs_limit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_limit.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VS_LIMIT_H
 +#define _VS_LIMIT_H
@@ -10234,9 +10234,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_limit.h linux-3.5-vs2.3.4/inclu
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_network.h linux-3.5-vs2.3.4/include/linux/vs_network.h
---- linux-3.5/include/linux/vs_network.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_network.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_network.h linux-3.5.1-vs2.3.4.1/include/linux/vs_network.h
+--- linux-3.5.1/include/linux/vs_network.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_network.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,169 @@
 +#ifndef _NX_VS_NETWORK_H
 +#define _NX_VS_NETWORK_H
@@ -10407,9 +10407,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_network.h linux-3.5-vs2.3.4/inc
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_pid.h linux-3.5-vs2.3.4/include/linux/vs_pid.h
---- linux-3.5/include/linux/vs_pid.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_pid.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_pid.h linux-3.5.1-vs2.3.4.1/include/linux/vs_pid.h
+--- linux-3.5.1/include/linux/vs_pid.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_pid.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_PID_H
 +#define _VS_PID_H
@@ -10461,9 +10461,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_pid.h linux-3.5-vs2.3.4/include
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_sched.h linux-3.5-vs2.3.4/include/linux/vs_sched.h
---- linux-3.5/include/linux/vs_sched.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_sched.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_sched.h linux-3.5.1-vs2.3.4.1/include/linux/vs_sched.h
+--- linux-3.5.1/include/linux/vs_sched.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_sched.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _VS_SCHED_H
 +#define _VS_SCHED_H
@@ -10505,9 +10505,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_sched.h linux-3.5-vs2.3.4/inclu
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_socket.h linux-3.5-vs2.3.4/include/linux/vs_socket.h
---- linux-3.5/include/linux/vs_socket.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_socket.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_socket.h linux-3.5.1-vs2.3.4.1/include/linux/vs_socket.h
+--- linux-3.5.1/include/linux/vs_socket.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_socket.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,67 @@
 +#ifndef _VS_SOCKET_H
 +#define _VS_SOCKET_H
@@ -10576,9 +10576,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_socket.h linux-3.5-vs2.3.4/incl
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_tag.h linux-3.5-vs2.3.4/include/linux/vs_tag.h
---- linux-3.5/include/linux/vs_tag.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_tag.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_tag.h linux-3.5.1-vs2.3.4.1/include/linux/vs_tag.h
+--- linux-3.5.1/include/linux/vs_tag.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_tag.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VS_TAG_H
 +#define _VS_TAG_H
@@ -10627,9 +10627,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_tag.h linux-3.5-vs2.3.4/include
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vs_time.h linux-3.5-vs2.3.4/include/linux/vs_time.h
---- linux-3.5/include/linux/vs_time.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vs_time.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vs_time.h linux-3.5.1-vs2.3.4.1/include/linux/vs_time.h
+--- linux-3.5.1/include/linux/vs_time.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vs_time.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VS_TIME_H
 +#define _VS_TIME_H
@@ -10650,9 +10650,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vs_time.h linux-3.5-vs2.3.4/includ
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vserver/Kbuild linux-3.5-vs2.3.4/include/linux/vserver/Kbuild
---- linux-3.5/include/linux/vserver/Kbuild	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/Kbuild	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/Kbuild linux-3.5.1-vs2.3.4.1/include/linux/vserver/Kbuild
+--- linux-3.5.1/include/linux/vserver/Kbuild	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/Kbuild	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,8 @@
 +
 +header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -10662,9 +10662,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/Kbuild linux-3.5-vs2.3.4/i
 +
 +header-y += switch.h network.h monitor.h inode.h device.h
 +
-diff -NurpP --minimal linux-3.5/include/linux/vserver/base.h linux-3.5-vs2.3.4/include/linux/vserver/base.h
---- linux-3.5/include/linux/vserver/base.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/base.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/base.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/base.h
+--- linux-3.5.1/include/linux/vserver/base.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/base.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,178 @@
 +#ifndef _VX_BASE_H
 +#define _VX_BASE_H
@@ -10844,9 +10844,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/base.h linux-3.5-vs2.3.4/i
 +#define nx_info_state(n, m)	(__nx_state(n) & (m))
 +
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct.h linux-3.5-vs2.3.4/include/linux/vserver/cacct.h
---- linux-3.5/include/linux/vserver/cacct.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cacct.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cacct.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct.h
+--- linux-3.5.1/include/linux/vserver/cacct.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_CACCT_H
 +#define _VX_CACCT_H
@@ -10863,9 +10863,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct.h linux-3.5-vs2.3.4/
 +};
 +
 +#endif	/* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_cmd.h
---- linux-3.5/include/linux/vserver/cacct_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cacct_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_cmd.h
+--- linux-3.5.1/include/linux/vserver/cacct_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_CACCT_CMD_H
 +#define _VX_CACCT_CMD_H
@@ -10890,9 +10890,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_def.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_def.h
---- linux-3.5/include/linux/vserver/cacct_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_def.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cacct_def.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_def.h
+--- linux-3.5.1/include/linux/vserver/cacct_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_def.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_CACCT_DEF_H
 +#define _VX_CACCT_DEF_H
@@ -10937,9 +10937,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_def.h linux-3.5-vs2.
 +#endif
 +
 +#endif	/* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_int.h linux-3.5-vs2.3.4/include/linux/vserver/cacct_int.h
---- linux-3.5/include/linux/vserver/cacct_int.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cacct_int.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cacct_int.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_int.h
+--- linux-3.5.1/include/linux/vserver/cacct_int.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cacct_int.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_CACCT_INT_H
 +#define _VX_CACCT_INT_H
@@ -10962,9 +10962,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cacct_int.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/check.h linux-3.5-vs2.3.4/include/linux/vserver/check.h
---- linux-3.5/include/linux/vserver/check.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/check.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/check.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/check.h
+--- linux-3.5.1/include/linux/vserver/check.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/check.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,89 @@
 +#ifndef _VS_CHECK_H
 +#define _VS_CHECK_H
@@ -11055,9 +11055,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/check.h linux-3.5-vs2.3.4/
 +#define nx_weak_check(c, m)	((m) ? nx_check(c, m) : 1)
 +
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vserver/context.h linux-3.5-vs2.3.4/include/linux/vserver/context.h
---- linux-3.5/include/linux/vserver/context.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/context.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/context.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/context.h
+--- linux-3.5.1/include/linux/vserver/context.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/context.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,188 @@
 +#ifndef _VX_CONTEXT_H
 +#define _VX_CONTEXT_H
@@ -11247,9 +11247,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/context.h linux-3.5-vs2.3.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/context_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/context_cmd.h
---- linux-3.5/include/linux/vserver/context_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/context_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/context_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/context_cmd.h
+--- linux-3.5.1/include/linux/vserver/context_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/context_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,162 @@
 +#ifndef _VX_CONTEXT_CMD_H
 +#define _VX_CONTEXT_CMD_H
@@ -11413,9 +11413,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/context_cmd.h linux-3.5-vs
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt.h
---- linux-3.5/include/linux/vserver/cvirt.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cvirt.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt.h
+--- linux-3.5.1/include/linux/vserver/cvirt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_CVIRT_H
 +#define _VX_CVIRT_H
@@ -11439,9 +11439,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt.h linux-3.5-vs2.3.4/
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt_cmd.h
---- linux-3.5/include/linux/vserver/cvirt_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cvirt_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt_cmd.h
+--- linux-3.5.1/include/linux/vserver/cvirt_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CVIRT_CMD_H
 +#define _VX_CVIRT_CMD_H
@@ -11496,9 +11496,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_def.h linux-3.5-vs2.3.4/include/linux/vserver/cvirt_def.h
---- linux-3.5/include/linux/vserver/cvirt_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/cvirt_def.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/cvirt_def.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt_def.h
+--- linux-3.5.1/include/linux/vserver/cvirt_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/cvirt_def.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,80 @@
 +#ifndef _VX_CVIRT_DEF_H
 +#define _VX_CVIRT_DEF_H
@@ -11580,9 +11580,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/cvirt_def.h linux-3.5-vs2.
 +#endif
 +
 +#endif	/* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/debug.h linux-3.5-vs2.3.4/include/linux/vserver/debug.h
---- linux-3.5/include/linux/vserver/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/debug.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/debug.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/debug.h
+--- linux-3.5.1/include/linux/vserver/debug.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/debug.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,145 @@
 +#ifndef _VX_DEBUG_H
 +#define _VX_DEBUG_H
@@ -11729,9 +11729,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/debug.h linux-3.5-vs2.3.4/
 +
 +
 +#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/debug_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/debug_cmd.h
---- linux-3.5/include/linux/vserver/debug_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/debug_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/debug_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/debug_cmd.h
+--- linux-3.5.1/include/linux/vserver/debug_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/debug_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VX_DEBUG_CMD_H
 +#define _VX_DEBUG_CMD_H
@@ -11791,9 +11791,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/debug_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/device.h linux-3.5-vs2.3.4/include/linux/vserver/device.h
---- linux-3.5/include/linux/vserver/device.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/device.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/device.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/device.h
+--- linux-3.5.1/include/linux/vserver/device.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/device.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_DEVICE_H
 +#define _VX_DEVICE_H
@@ -11810,9 +11810,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/device.h linux-3.5-vs2.3.4
 +#else	/* _VX_DEVICE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/device_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/device_cmd.h
---- linux-3.5/include/linux/vserver/device_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/device_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/device_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/device_cmd.h
+--- linux-3.5.1/include/linux/vserver/device_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/device_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,44 @@
 +#ifndef _VX_DEVICE_CMD_H
 +#define _VX_DEVICE_CMD_H
@@ -11858,9 +11858,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/device_cmd.h linux-3.5-vs2
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/device_def.h linux-3.5-vs2.3.4/include/linux/vserver/device_def.h
---- linux-3.5/include/linux/vserver/device_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/device_def.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/device_def.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/device_def.h
+--- linux-3.5.1/include/linux/vserver/device_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/device_def.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,17 @@
 +#ifndef _VX_DEVICE_DEF_H
 +#define _VX_DEVICE_DEF_H
@@ -11879,9 +11879,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/device_def.h linux-3.5-vs2
 +};
 +
 +#endif	/* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit.h linux-3.5-vs2.3.4/include/linux/vserver/dlimit.h
---- linux-3.5/include/linux/vserver/dlimit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/dlimit.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/dlimit.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/dlimit.h
+--- linux-3.5.1/include/linux/vserver/dlimit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/dlimit.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,54 @@
 +#ifndef _VX_DLIMIT_H
 +#define _VX_DLIMIT_H
@@ -11937,9 +11937,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit.h linux-3.5-vs2.3.4
 +#else	/* _VX_DLIMIT_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/dlimit_cmd.h
---- linux-3.5/include/linux/vserver/dlimit_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/dlimit_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/dlimit_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/dlimit_cmd.h
+--- linux-3.5.1/include/linux/vserver/dlimit_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/dlimit_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,109 @@
 +#ifndef _VX_DLIMIT_CMD_H
 +#define _VX_DLIMIT_CMD_H
@@ -12050,9 +12050,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/dlimit_cmd.h linux-3.5-vs2
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/global.h linux-3.5-vs2.3.4/include/linux/vserver/global.h
---- linux-3.5/include/linux/vserver/global.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/global.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/global.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/global.h
+--- linux-3.5.1/include/linux/vserver/global.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/global.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VX_GLOBAL_H
 +#define _VX_GLOBAL_H
@@ -12073,9 +12073,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/global.h linux-3.5-vs2.3.4
 +
 +
 +#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/history.h linux-3.5-vs2.3.4/include/linux/vserver/history.h
---- linux-3.5/include/linux/vserver/history.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/history.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/history.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/history.h
+--- linux-3.5.1/include/linux/vserver/history.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/history.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,197 @@
 +#ifndef _VX_HISTORY_H
 +#define _VX_HISTORY_H
@@ -12274,9 +12274,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/history.h linux-3.5-vs2.3.
 +#endif /* CONFIG_VSERVER_HISTORY */
 +
 +#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/inode.h linux-3.5-vs2.3.4/include/linux/vserver/inode.h
---- linux-3.5/include/linux/vserver/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/inode.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/inode.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/inode.h
+--- linux-3.5.1/include/linux/vserver/inode.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/inode.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef _VX_INODE_H
 +#define _VX_INODE_H
@@ -12317,9 +12317,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/inode.h linux-3.5-vs2.3.4/
 +#else	/* _VX_INODE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_INODE_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/inode_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/inode_cmd.h
---- linux-3.5/include/linux/vserver/inode_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/inode_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/inode_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/inode_cmd.h
+--- linux-3.5.1/include/linux/vserver/inode_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/inode_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,59 @@
 +#ifndef _VX_INODE_CMD_H
 +#define _VX_INODE_CMD_H
@@ -12380,9 +12380,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/inode_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/limit.h linux-3.5-vs2.3.4/include/linux/vserver/limit.h
---- linux-3.5/include/linux/vserver/limit.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/limit.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/limit.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit.h
+--- linux-3.5.1/include/linux/vserver/limit.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_H
 +#define _VX_LIMIT_H
@@ -12455,9 +12455,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/limit.h linux-3.5-vs2.3.4/
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/limit_cmd.h
---- linux-3.5/include/linux/vserver/limit_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/limit_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/limit_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_cmd.h
+--- linux-3.5.1/include/linux/vserver/limit_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_CMD_H
 +#define _VX_LIMIT_CMD_H
@@ -12530,9 +12530,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_def.h linux-3.5-vs2.3.4/include/linux/vserver/limit_def.h
---- linux-3.5/include/linux/vserver/limit_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/limit_def.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/limit_def.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_def.h
+--- linux-3.5.1/include/linux/vserver/limit_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_def.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VX_LIMIT_DEF_H
 +#define _VX_LIMIT_DEF_H
@@ -12581,9 +12581,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_def.h linux-3.5-vs2.
 +#endif
 +
 +#endif	/* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_int.h linux-3.5-vs2.3.4/include/linux/vserver/limit_int.h
---- linux-3.5/include/linux/vserver/limit_int.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/limit_int.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/limit_int.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_int.h
+--- linux-3.5.1/include/linux/vserver/limit_int.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/limit_int.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,198 @@
 +#ifndef _VX_LIMIT_INT_H
 +#define _VX_LIMIT_INT_H
@@ -12783,9 +12783,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/limit_int.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/monitor.h linux-3.5-vs2.3.4/include/linux/vserver/monitor.h
---- linux-3.5/include/linux/vserver/monitor.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/monitor.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/monitor.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/monitor.h
+--- linux-3.5.1/include/linux/vserver/monitor.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/monitor.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,96 @@
 +#ifndef _VX_MONITOR_H
 +#define _VX_MONITOR_H
@@ -12883,9 +12883,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/monitor.h linux-3.5-vs2.3.
 +
 +
 +#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/network.h linux-3.5-vs2.3.4/include/linux/vserver/network.h
---- linux-3.5/include/linux/vserver/network.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/network.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/network.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/network.h
+--- linux-3.5.1/include/linux/vserver/network.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/network.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,148 @@
 +#ifndef _VX_NETWORK_H
 +#define _VX_NETWORK_H
@@ -13035,9 +13035,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/network.h linux-3.5-vs2.3.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/network_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/network_cmd.h
---- linux-3.5/include/linux/vserver/network_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/network_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/network_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/network_cmd.h
+--- linux-3.5.1/include/linux/vserver/network_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/network_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,164 @@
 +#ifndef _VX_NETWORK_CMD_H
 +#define _VX_NETWORK_CMD_H
@@ -13203,9 +13203,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/network_cmd.h linux-3.5-vs
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/percpu.h linux-3.5-vs2.3.4/include/linux/vserver/percpu.h
---- linux-3.5/include/linux/vserver/percpu.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/percpu.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/percpu.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/percpu.h
+--- linux-3.5.1/include/linux/vserver/percpu.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/percpu.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_PERCPU_H
 +#define _VX_PERCPU_H
@@ -13221,9 +13221,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/percpu.h linux-3.5-vs2.3.4
 +#define	PERCPU_PERCTX	(sizeof(struct _vx_percpu))
 +
 +#endif	/* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/pid.h linux-3.5-vs2.3.4/include/linux/vserver/pid.h
---- linux-3.5/include/linux/vserver/pid.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/pid.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/pid.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/pid.h
+--- linux-3.5.1/include/linux/vserver/pid.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/pid.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,51 @@
 +#ifndef _VSERVER_PID_H
 +#define _VSERVER_PID_H
@@ -13276,9 +13276,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/pid.h linux-3.5-vs2.3.4/in
 +}
 +
 +#endif
-diff -NurpP --minimal linux-3.5/include/linux/vserver/sched.h linux-3.5-vs2.3.4/include/linux/vserver/sched.h
---- linux-3.5/include/linux/vserver/sched.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/sched.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/sched.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched.h
+--- linux-3.5.1/include/linux/vserver/sched.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_SCHED_H
 +#define _VX_SCHED_H
@@ -13303,9 +13303,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/sched.h linux-3.5-vs2.3.4/
 +#else	/* _VX_SCHED_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/sched_cmd.h
---- linux-3.5/include/linux/vserver/sched_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/sched_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/sched_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched_cmd.h
+--- linux-3.5.1/include/linux/vserver/sched_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_SCHED_CMD_H
 +#define _VX_SCHED_CMD_H
@@ -13328,9 +13328,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_def.h linux-3.5-vs2.3.4/include/linux/vserver/sched_def.h
---- linux-3.5/include/linux/vserver/sched_def.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/sched_def.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/sched_def.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched_def.h
+--- linux-3.5.1/include/linux/vserver/sched_def.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/sched_def.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SCHED_DEF_H
 +#define _VX_SCHED_DEF_H
@@ -13370,9 +13370,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/sched_def.h linux-3.5-vs2.
 +#endif
 +
 +#endif	/* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/signal.h linux-3.5-vs2.3.4/include/linux/vserver/signal.h
---- linux-3.5/include/linux/vserver/signal.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/signal.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/signal.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/signal.h
+--- linux-3.5.1/include/linux/vserver/signal.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/signal.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_SIGNAL_H
 +#define _VX_SIGNAL_H
@@ -13388,9 +13388,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/signal.h linux-3.5-vs2.3.4
 +#else	/* _VX_SIGNAL_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/signal_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/signal_cmd.h
---- linux-3.5/include/linux/vserver/signal_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/signal_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/signal_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/signal_cmd.h
+--- linux-3.5.1/include/linux/vserver/signal_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/signal_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_SIGNAL_CMD_H
 +#define _VX_SIGNAL_CMD_H
@@ -13435,9 +13435,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/signal_cmd.h linux-3.5-vs2
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/space.h linux-3.5-vs2.3.4/include/linux/vserver/space.h
---- linux-3.5/include/linux/vserver/space.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/space.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/space.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/space.h
+--- linux-3.5.1/include/linux/vserver/space.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/space.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _VX_SPACE_H
 +#define _VX_SPACE_H
@@ -13451,9 +13451,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/space.h linux-3.5-vs2.3.4/
 +#else	/* _VX_SPACE_H */
 +#warning duplicate inclusion
 +#endif	/* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/space_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/space_cmd.h
---- linux-3.5/include/linux/vserver/space_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/space_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/space_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/space_cmd.h
+--- linux-3.5.1/include/linux/vserver/space_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/space_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SPACE_CMD_H
 +#define _VX_SPACE_CMD_H
@@ -13493,9 +13493,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/space_cmd.h linux-3.5-vs2.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/switch.h linux-3.5-vs2.3.4/include/linux/vserver/switch.h
---- linux-3.5/include/linux/vserver/switch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/switch.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/switch.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/switch.h
+--- linux-3.5.1/include/linux/vserver/switch.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/switch.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,98 @@
 +#ifndef _VX_SWITCH_H
 +#define _VX_SWITCH_H
@@ -13595,9 +13595,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/switch.h linux-3.5-vs2.3.4
 +
 +#endif	/* _VX_SWITCH_H */
 +
-diff -NurpP --minimal linux-3.5/include/linux/vserver/tag.h linux-3.5-vs2.3.4/include/linux/vserver/tag.h
---- linux-3.5/include/linux/vserver/tag.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/tag.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/tag.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/tag.h
+--- linux-3.5.1/include/linux/vserver/tag.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/tag.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,143 @@
 +#ifndef _DX_TAG_H
 +#define _DX_TAG_H
@@ -13742,9 +13742,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/tag.h linux-3.5-vs2.3.4/in
 +#endif
 +
 +#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.5/include/linux/vserver/tag_cmd.h linux-3.5-vs2.3.4/include/linux/vserver/tag_cmd.h
---- linux-3.5/include/linux/vserver/tag_cmd.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/linux/vserver/tag_cmd.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/linux/vserver/tag_cmd.h linux-3.5.1-vs2.3.4.1/include/linux/vserver/tag_cmd.h
+--- linux-3.5.1/include/linux/vserver/tag_cmd.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/linux/vserver/tag_cmd.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_TAG_CMD_H
 +#define _VX_TAG_CMD_H
@@ -13768,9 +13768,9 @@ diff -NurpP --minimal linux-3.5/include/linux/vserver/tag_cmd.h linux-3.5-vs2.3.
 +
 +#endif	/* __KERNEL__ */
 +#endif	/* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.5/include/net/addrconf.h linux-3.5-vs2.3.4/include/net/addrconf.h
---- linux-3.5/include/net/addrconf.h	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/net/addrconf.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/addrconf.h linux-3.5.1-vs2.3.4.1/include/net/addrconf.h
+--- linux-3.5.1/include/net/addrconf.h	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/net/addrconf.h	2012-07-23 01:45:55.000000000 +0200
 @@ -80,7 +80,8 @@ extern int			ipv6_dev_get_saddr(struct n
  					       struct net_device *dev,
  					       const struct in6_addr *daddr,
@@ -13781,9 +13781,9 @@ diff -NurpP --minimal linux-3.5/include/net/addrconf.h linux-3.5-vs2.3.4/include
  extern int			ipv6_get_lladdr(struct net_device *dev,
  						struct in6_addr *addr,
  						unsigned char banned_flags);
-diff -NurpP --minimal linux-3.5/include/net/af_unix.h linux-3.5-vs2.3.4/include/net/af_unix.h
---- linux-3.5/include/net/af_unix.h	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/net/af_unix.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/af_unix.h linux-3.5.1-vs2.3.4.1/include/net/af_unix.h
+--- linux-3.5.1/include/net/af_unix.h	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/net/af_unix.h	2012-07-23 01:45:55.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/socket.h>
  #include <linux/un.h>
@@ -13792,9 +13792,9 @@ diff -NurpP --minimal linux-3.5/include/net/af_unix.h linux-3.5-vs2.3.4/include/
  #include <net/sock.h>
  
  extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.5/include/net/inet_timewait_sock.h linux-3.5-vs2.3.4/include/net/inet_timewait_sock.h
---- linux-3.5/include/net/inet_timewait_sock.h	2012-03-19 19:47:29.000000000 +0100
-+++ linux-3.5-vs2.3.4/include/net/inet_timewait_sock.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/inet_timewait_sock.h linux-3.5.1-vs2.3.4.1/include/net/inet_timewait_sock.h
+--- linux-3.5.1/include/net/inet_timewait_sock.h	2012-03-19 19:47:29.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/include/net/inet_timewait_sock.h	2012-07-23 01:45:55.000000000 +0200
 @@ -112,6 +112,10 @@ struct inet_timewait_sock {
  #define tw_net			__tw_common.skc_net
  #define tw_daddr        	__tw_common.skc_daddr
@@ -13806,9 +13806,9 @@ diff -NurpP --minimal linux-3.5/include/net/inet_timewait_sock.h linux-3.5-vs2.3
  	int			tw_timeout;
  	volatile unsigned char	tw_substate;
  	unsigned char		tw_rcv_wscale;
-diff -NurpP --minimal linux-3.5/include/net/ip6_route.h linux-3.5-vs2.3.4/include/net/ip6_route.h
---- linux-3.5/include/net/ip6_route.h	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/net/ip6_route.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/ip6_route.h linux-3.5.1-vs2.3.4.1/include/net/ip6_route.h
+--- linux-3.5.1/include/net/ip6_route.h	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/net/ip6_route.h	2012-07-23 01:45:55.000000000 +0200
 @@ -88,7 +88,8 @@ extern int			ip6_route_get_saddr(struct 
  						    struct rt6_info *rt,
  						    const struct in6_addr *daddr,
@@ -13819,9 +13819,9 @@ diff -NurpP --minimal linux-3.5/include/net/ip6_route.h linux-3.5-vs2.3.4/includ
  
  extern struct rt6_info		*rt6_lookup(struct net *net,
  					    const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.5/include/net/route.h linux-3.5-vs2.3.4/include/net/route.h
---- linux-3.5/include/net/route.h	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/net/route.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/route.h linux-3.5.1-vs2.3.4.1/include/net/route.h
+--- linux-3.5.1/include/net/route.h	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/net/route.h	2012-07-23 01:45:55.000000000 +0200
 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
  		dst_release(&rt->dst);
  }
@@ -13869,9 +13869,9 @@ diff -NurpP --minimal linux-3.5/include/net/route.h linux-3.5-vs2.3.4/include/ne
  		rt = __ip_route_output_key(net, fl4);
  		if (IS_ERR(rt))
  			return rt;
-diff -NurpP --minimal linux-3.5/include/net/sock.h linux-3.5-vs2.3.4/include/net/sock.h
---- linux-3.5/include/net/sock.h	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/include/net/sock.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/include/net/sock.h linux-3.5.1-vs2.3.4.1/include/net/sock.h
+--- linux-3.5.1/include/net/sock.h	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/include/net/sock.h	2012-07-23 01:45:55.000000000 +0200
 @@ -171,6 +171,10 @@ struct sock_common {
  #ifdef CONFIG_NET_NS
  	struct net	 	*skc_net;
@@ -13894,9 +13894,9 @@ diff -NurpP --minimal linux-3.5/include/net/sock.h linux-3.5-vs2.3.4/include/net
  	socket_lock_t		sk_lock;
  	struct sk_buff_head	sk_receive_queue;
  	/*
-diff -NurpP --minimal linux-3.5/init/Kconfig linux-3.5-vs2.3.4/init/Kconfig
---- linux-3.5/init/Kconfig	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/init/Kconfig	2012-07-23 01:54:21.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/init/Kconfig linux-3.5.1-vs2.3.4.1/init/Kconfig
+--- linux-3.5.1/init/Kconfig	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/init/Kconfig	2012-07-23 01:54:21.000000000 +0200
 @@ -624,6 +624,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
  menuconfig CGROUPS
  	boolean "Control Group support"
@@ -13913,9 +13913,9 @@ diff -NurpP --minimal linux-3.5/init/Kconfig linux-3.5-vs2.3.4/init/Kconfig
  	select UIDGID_STRICT_TYPE_CHECKS
  
  	default n
-diff -NurpP --minimal linux-3.5/init/main.c linux-3.5-vs2.3.4/init/main.c
---- linux-3.5/init/main.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/init/main.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/init/main.c linux-3.5.1-vs2.3.4.1/init/main.c
+--- linux-3.5.1/init/main.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/init/main.c	2012-07-23 01:45:55.000000000 +0200
 @@ -68,6 +68,7 @@
  #include <linux/shmem_fs.h>
  #include <linux/slab.h>
@@ -13924,9 +13924,9 @@ diff -NurpP --minimal linux-3.5/init/main.c linux-3.5-vs2.3.4/init/main.c
  
  #include <asm/io.h>
  #include <asm/bugs.h>
-diff -NurpP --minimal linux-3.5/ipc/mqueue.c linux-3.5-vs2.3.4/ipc/mqueue.c
---- linux-3.5/ipc/mqueue.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/ipc/mqueue.c	2012-07-23 01:56:45.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/ipc/mqueue.c linux-3.5.1-vs2.3.4.1/ipc/mqueue.c
+--- linux-3.5.1/ipc/mqueue.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/ipc/mqueue.c	2012-07-23 01:56:45.000000000 +0200
 @@ -35,6 +35,8 @@
  #include <linux/ipc_namespace.h>
  #include <linux/user_namespace.h>
@@ -14002,9 +14002,9 @@ diff -NurpP --minimal linux-3.5/ipc/mqueue.c linux-3.5-vs2.3.4/ipc/mqueue.c
  		free_uid(user);
  	}
  	if (ipc_ns)
-diff -NurpP --minimal linux-3.5/ipc/msg.c linux-3.5-vs2.3.4/ipc/msg.c
---- linux-3.5/ipc/msg.c	2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.5-vs2.3.4/ipc/msg.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/ipc/msg.c linux-3.5.1-vs2.3.4.1/ipc/msg.c
+--- linux-3.5.1/ipc/msg.c	2011-05-22 16:17:59.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/ipc/msg.c	2012-07-23 01:45:55.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -14021,9 +14021,9 @@ diff -NurpP --minimal linux-3.5/ipc/msg.c linux-3.5-vs2.3.4/ipc/msg.c
  
  	msq->q_perm.security = NULL;
  	retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.5/ipc/namespace.c linux-3.5-vs2.3.4/ipc/namespace.c
---- linux-3.5/ipc/namespace.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/ipc/namespace.c	2012-07-23 03:31:37.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/ipc/namespace.c linux-3.5.1-vs2.3.4.1/ipc/namespace.c
+--- linux-3.5.1/ipc/namespace.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/ipc/namespace.c	2012-07-23 03:31:37.000000000 +0200
 @@ -13,11 +13,12 @@
  #include <linux/mount.h>
  #include <linux/user_namespace.h>
@@ -14065,9 +14065,9 @@ diff -NurpP --minimal linux-3.5/ipc/namespace.c linux-3.5-vs2.3.4/ipc/namespace.
  }
  
  /*
-diff -NurpP --minimal linux-3.5/ipc/sem.c linux-3.5-vs2.3.4/ipc/sem.c
---- linux-3.5/ipc/sem.c	2012-01-09 16:14:59.000000000 +0100
-+++ linux-3.5-vs2.3.4/ipc/sem.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/ipc/sem.c linux-3.5.1-vs2.3.4.1/ipc/sem.c
+--- linux-3.5.1/ipc/sem.c	2012-01-09 16:14:59.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/ipc/sem.c	2012-07-23 01:45:55.000000000 +0200
 @@ -86,6 +86,8 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -14105,9 +14105,9 @@ diff -NurpP --minimal linux-3.5/ipc/sem.c linux-3.5-vs2.3.4/ipc/sem.c
  	security_sem_free(sma);
  	ipc_rcu_putref(sma);
  }
-diff -NurpP --minimal linux-3.5/ipc/shm.c linux-3.5-vs2.3.4/ipc/shm.c
---- linux-3.5/ipc/shm.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/ipc/shm.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/ipc/shm.c linux-3.5.1-vs2.3.4.1/ipc/shm.c
+--- linux-3.5.1/ipc/shm.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/ipc/shm.c	2012-07-23 01:45:55.000000000 +0200
 @@ -39,6 +39,8 @@
  #include <linux/nsproxy.h>
  #include <linux/mount.h>
@@ -14163,9 +14163,9 @@ diff -NurpP --minimal linux-3.5/ipc/shm.c linux-3.5-vs2.3.4/ipc/shm.c
  	return error;
  
  no_id:
-diff -NurpP --minimal linux-3.5/kernel/Makefile linux-3.5-vs2.3.4/kernel/Makefile
---- linux-3.5/kernel/Makefile	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/Makefile	2012-07-23 10:20:32.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/Makefile linux-3.5.1-vs2.3.4.1/kernel/Makefile
+--- linux-3.5.1/kernel/Makefile	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/Makefile	2012-07-23 10:20:32.000000000 +0200
 @@ -24,6 +24,7 @@ endif
  
  obj-y += sched/
@@ -14174,9 +14174,9 @@ diff -NurpP --minimal linux-3.5/kernel/Makefile linux-3.5-vs2.3.4/kernel/Makefil
  
  ifeq ($(CONFIG_CHECKPOINT_RESTORE),y)
  obj-$(CONFIG_X86) += kcmp.o
-diff -NurpP --minimal linux-3.5/kernel/auditsc.c linux-3.5-vs2.3.4/kernel/auditsc.c
---- linux-3.5/kernel/auditsc.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/auditsc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/auditsc.c linux-3.5.1-vs2.3.4.1/kernel/auditsc.c
+--- linux-3.5.1/kernel/auditsc.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/auditsc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2309,7 +2309,7 @@ int audit_set_loginuid(uid_t loginuid)
  	if (task->loginuid != -1)
  		return -EPERM;
@@ -14186,9 +14186,9 @@ diff -NurpP --minimal linux-3.5/kernel/auditsc.c linux-3.5-vs2.3.4/kernel/audits
  		return -EPERM;
  #endif  /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
  
-diff -NurpP --minimal linux-3.5/kernel/capability.c linux-3.5-vs2.3.4/kernel/capability.c
---- linux-3.5/kernel/capability.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/capability.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/capability.c linux-3.5.1-vs2.3.4.1/kernel/capability.c
+--- linux-3.5.1/kernel/capability.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/capability.c	2012-07-23 01:45:55.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/syscalls.h>
  #include <linux/pid_namespace.h>
@@ -14214,9 +14214,9 @@ diff -NurpP --minimal linux-3.5/kernel/capability.c linux-3.5-vs2.3.4/kernel/cap
  /**
   * has_capability_noaudit - Does a task have a capability (unaudited) in the
   * initial user ns
-diff -NurpP --minimal linux-3.5/kernel/compat.c linux-3.5-vs2.3.4/kernel/compat.c
---- linux-3.5/kernel/compat.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/compat.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/compat.c linux-3.5.1-vs2.3.4.1/kernel/compat.c
+--- linux-3.5.1/kernel/compat.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/compat.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1054,7 +1054,7 @@ asmlinkage long compat_sys_stime(compat_
  	if (err)
  		return err;
@@ -14226,9 +14226,9 @@ diff -NurpP --minimal linux-3.5/kernel/compat.c linux-3.5-vs2.3.4/kernel/compat.
  	return 0;
  }
  
-diff -NurpP --minimal linux-3.5/kernel/cred.c linux-3.5-vs2.3.4/kernel/cred.c
---- linux-3.5/kernel/cred.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/cred.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/cred.c linux-3.5.1-vs2.3.4.1/kernel/cred.c
+--- linux-3.5.1/kernel/cred.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/cred.c	2012-07-23 01:45:55.000000000 +0200
 @@ -70,31 +70,6 @@ struct cred init_cred = {
  #endif
  };
@@ -14298,9 +14298,9 @@ diff -NurpP --minimal linux-3.5/kernel/cred.c linux-3.5-vs2.3.4/kernel/cred.c
  EXPORT_SYMBOL(prepare_creds);
  
  /*
-diff -NurpP --minimal linux-3.5/kernel/exit.c linux-3.5-vs2.3.4/kernel/exit.c
---- linux-3.5/kernel/exit.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/exit.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/exit.c linux-3.5.1-vs2.3.4.1/kernel/exit.c
+--- linux-3.5.1/kernel/exit.c	2012-08-11 15:13:44.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/exit.c	2012-08-11 15:15:02.000000000 +0200
 @@ -48,6 +48,10 @@
  #include <linux/fs_struct.h>
  #include <linux/init_task.h>
@@ -14350,9 +14350,9 @@ diff -NurpP --minimal linux-3.5/kernel/exit.c linux-3.5-vs2.3.4/kernel/exit.c
  	BUG();
  	/* Avoid "noreturn function does return".  */
  	for (;;)
-diff -NurpP --minimal linux-3.5/kernel/fork.c linux-3.5-vs2.3.4/kernel/fork.c
---- linux-3.5/kernel/fork.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/fork.c	2012-07-23 03:32:15.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/fork.c linux-3.5.1-vs2.3.4.1/kernel/fork.c
+--- linux-3.5.1/kernel/fork.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/fork.c	2012-07-23 03:32:15.000000000 +0200
 @@ -70,6 +70,9 @@
  #include <linux/khugepaged.h>
  #include <linux/signalfd.h>
@@ -14445,9 +14445,9 @@ diff -NurpP --minimal linux-3.5/kernel/fork.c linux-3.5-vs2.3.4/kernel/fork.c
  	write_unlock_irq(&tasklist_lock);
  	proc_fork_connector(p);
  	cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.5/kernel/kthread.c linux-3.5-vs2.3.4/kernel/kthread.c
---- linux-3.5/kernel/kthread.c	2012-03-19 19:47:30.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/kthread.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/kthread.c linux-3.5.1-vs2.3.4.1/kernel/kthread.c
+--- linux-3.5.1/kernel/kthread.c	2012-03-19 19:47:30.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/kthread.c	2012-07-23 01:45:55.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/mutex.h>
  #include <linux/slab.h>
@@ -14456,9 +14456,9 @@ diff -NurpP --minimal linux-3.5/kernel/kthread.c linux-3.5-vs2.3.4/kernel/kthrea
  #include <trace/events/sched.h>
  
  static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.5/kernel/nsproxy.c linux-3.5-vs2.3.4/kernel/nsproxy.c
---- linux-3.5/kernel/nsproxy.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/nsproxy.c	2012-07-23 10:58:02.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/nsproxy.c linux-3.5.1-vs2.3.4.1/kernel/nsproxy.c
+--- linux-3.5.1/kernel/nsproxy.c	2012-01-09 16:15:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/nsproxy.c	2012-07-23 10:58:02.000000000 +0200
 @@ -20,11 +20,14 @@
  #include <linux/mnt_namespace.h>
  #include <linux/utsname.h>
@@ -14640,9 +14640,9 @@ diff -NurpP --minimal linux-3.5/kernel/nsproxy.c linux-3.5-vs2.3.4/kernel/nsprox
  		return -EPERM;
  
  	*new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.5/kernel/pid.c linux-3.5-vs2.3.4/kernel/pid.c
---- linux-3.5/kernel/pid.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/pid.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/pid.c linux-3.5.1-vs2.3.4.1/kernel/pid.c
+--- linux-3.5.1/kernel/pid.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/pid.c	2012-07-23 01:45:55.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
@@ -14700,9 +14700,9 @@ diff -NurpP --minimal linux-3.5/kernel/pid.c linux-3.5-vs2.3.4/kernel/pid.c
  pid_t pid_vnr(struct pid *pid)
  {
  	return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.5/kernel/pid_namespace.c linux-3.5-vs2.3.4/kernel/pid_namespace.c
---- linux-3.5/kernel/pid_namespace.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/pid_namespace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/pid_namespace.c linux-3.5.1-vs2.3.4.1/kernel/pid_namespace.c
+--- linux-3.5.1/kernel/pid_namespace.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/pid_namespace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/slab.h>
  #include <linux/proc_fs.h>
@@ -14727,9 +14727,9 @@ diff -NurpP --minimal linux-3.5/kernel/pid_namespace.c linux-3.5-vs2.3.4/kernel/
  	kmem_cache_free(pid_ns_cachep, ns);
  }
  
-diff -NurpP --minimal linux-3.5/kernel/posix-timers.c linux-3.5-vs2.3.4/kernel/posix-timers.c
---- linux-3.5/kernel/posix-timers.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/posix-timers.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/posix-timers.c linux-3.5.1-vs2.3.4.1/kernel/posix-timers.c
+--- linux-3.5.1/kernel/posix-timers.c	2012-01-09 16:15:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/posix-timers.c	2012-07-23 01:45:55.000000000 +0200
 @@ -47,6 +47,7 @@
  #include <linux/wait.h>
  #include <linux/workqueue.h>
@@ -14765,9 +14765,9 @@ diff -NurpP --minimal linux-3.5/kernel/posix-timers.c linux-3.5-vs2.3.4/kernel/p
  	/* If we failed to send the signal the timer stops. */
  	return ret > 0;
  }
-diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.c
---- linux-3.5/kernel/printk.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/printk.c	2012-07-23 03:35:09.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/printk.c linux-3.5.1-vs2.3.4.1/kernel/printk.c
+--- linux-3.5.1/kernel/printk.c	2012-08-11 15:13:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/printk.c	2012-08-11 15:15:02.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/notifier.h>
  #include <linux/rculist.h>
@@ -14776,7 +14776,7 @@ diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.
  
  #include <asm/uaccess.h>
  
-@@ -782,7 +783,7 @@ static int check_syslog_permissions(int 
+@@ -783,7 +784,7 @@ static int check_syslog_permissions(int 
  		return 0;
  
  	if (syslog_action_restricted(type)) {
@@ -14785,7 +14785,7 @@ diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.
  			return 0;
  		/* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
  		if (capable(CAP_SYS_ADMIN)) {
-@@ -1071,12 +1072,9 @@ int do_syslog(int type, char __user *buf
+@@ -1074,12 +1075,9 @@ int do_syslog(int type, char __user *buf
  	if (error)
  		return error;
  
@@ -14801,7 +14801,7 @@ diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.
  		error = -EINVAL;
  		if (!buf || len < 0)
  			goto out;
-@@ -1087,6 +1085,16 @@ int do_syslog(int type, char __user *buf
+@@ -1090,6 +1088,16 @@ int do_syslog(int type, char __user *buf
  			error = -EFAULT;
  			goto out;
  		}
@@ -14818,7 +14818,7 @@ diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.
  		error = wait_event_interruptible(log_wait,
  						 syslog_seq != log_next_seq);
  		if (error)
-@@ -1099,16 +1107,6 @@ int do_syslog(int type, char __user *buf
+@@ -1102,16 +1110,6 @@ int do_syslog(int type, char __user *buf
  		/* FALL THRU */
  	/* Read last kernel messages */
  	case SYSLOG_ACTION_READ_ALL:
@@ -14835,9 +14835,9 @@ diff -NurpP --minimal linux-3.5/kernel/printk.c linux-3.5-vs2.3.4/kernel/printk.
  		error = syslog_print_all(buf, len, clear);
  		break;
  	/* Clear ring buffer */
-diff -NurpP --minimal linux-3.5/kernel/ptrace.c linux-3.5-vs2.3.4/kernel/ptrace.c
---- linux-3.5/kernel/ptrace.c	2012-07-22 23:39:46.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/ptrace.c linux-3.5.1-vs2.3.4.1/kernel/ptrace.c
+--- linux-3.5.1/kernel/ptrace.c	2012-07-22 23:39:46.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/ptrace.c	2012-07-23 01:45:55.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/syscalls.h>
  #include <linux/uaccess.h>
@@ -14858,9 +14858,9 @@ diff -NurpP --minimal linux-3.5/kernel/ptrace.c linux-3.5-vs2.3.4/kernel/ptrace.
  
  	return security_ptrace_access_check(task, mode);
  }
-diff -NurpP --minimal linux-3.5/kernel/sched/core.c linux-3.5-vs2.3.4/kernel/sched/core.c
---- linux-3.5/kernel/sched/core.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/sched/core.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/sched/core.c linux-3.5.1-vs2.3.4.1/kernel/sched/core.c
+--- linux-3.5.1/kernel/sched/core.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/sched/core.c	2012-07-23 01:45:55.000000000 +0200
 @@ -72,6 +72,8 @@
  #include <linux/slab.h>
  #include <linux/init_task.h>
@@ -14932,9 +14932,9 @@ diff -NurpP --minimal linux-3.5/kernel/sched/core.c linux-3.5-vs2.3.4/kernel/sch
  
  	retval = security_task_setnice(current, nice);
  	if (retval)
-diff -NurpP --minimal linux-3.5/kernel/sched/fair.c linux-3.5-vs2.3.4/kernel/sched/fair.c
---- linux-3.5/kernel/sched/fair.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/sched/fair.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/sched/fair.c linux-3.5.1-vs2.3.4.1/kernel/sched/fair.c
+--- linux-3.5.1/kernel/sched/fair.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/sched/fair.c	2012-07-23 01:45:55.000000000 +0200
 @@ -26,6 +26,7 @@
  #include <linux/slab.h>
  #include <linux/profile.h>
@@ -14961,9 +14961,9 @@ diff -NurpP --minimal linux-3.5/kernel/sched/fair.c linux-3.5-vs2.3.4/kernel/sch
  	update_cfs_load(cfs_rq, 0);
  	account_entity_dequeue(cfs_rq, se);
  
-diff -NurpP --minimal linux-3.5/kernel/signal.c linux-3.5-vs2.3.4/kernel/signal.c
---- linux-3.5/kernel/signal.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/signal.c	2012-07-23 03:53:00.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/signal.c linux-3.5.1-vs2.3.4.1/kernel/signal.c
+--- linux-3.5.1/kernel/signal.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/signal.c	2012-07-23 03:53:00.000000000 +0200
 @@ -30,6 +30,8 @@
  #include <linux/nsproxy.h>
  #include <linux/user_namespace.h>
@@ -15056,9 +15056,9 @@ diff -NurpP --minimal linux-3.5/kernel/signal.c linux-3.5-vs2.3.4/kernel/signal.
  		if (sig_kernel_stop(signr)) {
  			/*
  			 * The default action is to stop all threads in
-diff -NurpP --minimal linux-3.5/kernel/softirq.c linux-3.5-vs2.3.4/kernel/softirq.c
---- linux-3.5/kernel/softirq.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/softirq.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/softirq.c linux-3.5.1-vs2.3.4.1/kernel/softirq.c
+--- linux-3.5.1/kernel/softirq.c	2012-05-21 18:07:34.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/softirq.c	2012-07-23 01:45:55.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/ftrace.h>
  #include <linux/smp.h>
@@ -15067,9 +15067,9 @@ diff -NurpP --minimal linux-3.5/kernel/softirq.c linux-3.5-vs2.3.4/kernel/softir
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.5/kernel/sys.c linux-3.5-vs2.3.4/kernel/sys.c
---- linux-3.5/kernel/sys.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/sys.c	2012-07-23 03:33:13.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/sys.c linux-3.5.1-vs2.3.4.1/kernel/sys.c
+--- linux-3.5.1/kernel/sys.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/sys.c	2012-07-23 03:33:13.000000000 +0200
 @@ -47,6 +47,7 @@
  #include <linux/syscalls.h>
  #include <linux/kprobes.h>
@@ -15166,9 +15166,9 @@ diff -NurpP --minimal linux-3.5/kernel/sys.c linux-3.5-vs2.3.4/kernel/sys.c
  		return 0;
  
  	return -EPERM;
-diff -NurpP --minimal linux-3.5/kernel/sysctl.c linux-3.5-vs2.3.4/kernel/sysctl.c
---- linux-3.5/kernel/sysctl.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/sysctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/sysctl.c linux-3.5.1-vs2.3.4.1/kernel/sysctl.c
+--- linux-3.5.1/kernel/sysctl.c	2012-05-21 18:07:34.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/sysctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -81,6 +81,7 @@
  #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
  #include <linux/lockdep.h>
@@ -15191,9 +15191,9 @@ diff -NurpP --minimal linux-3.5/kernel/sysctl.c linux-3.5-vs2.3.4/kernel/sysctl.
  #ifdef CONFIG_CHR_DEV_SG
  	{
  		.procname	= "sg-big-buff",
-diff -NurpP --minimal linux-3.5/kernel/sysctl_binary.c linux-3.5-vs2.3.4/kernel/sysctl_binary.c
---- linux-3.5/kernel/sysctl_binary.c	2012-01-09 16:15:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/sysctl_binary.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/sysctl_binary.c linux-3.5.1-vs2.3.4.1/kernel/sysctl_binary.c
+--- linux-3.5.1/kernel/sysctl_binary.c	2012-01-09 16:15:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/sysctl_binary.c	2012-07-23 01:45:55.000000000 +0200
 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
  
  	{ CTL_INT,	KERN_PANIC,			"panic" },
@@ -15202,9 +15202,9 @@ diff -NurpP --minimal linux-3.5/kernel/sysctl_binary.c linux-3.5-vs2.3.4/kernel/
  
  	{ CTL_STR,	KERN_SPARC_REBOOT,		"reboot-cmd" },
  	{ CTL_INT,	KERN_CTLALTDEL,			"ctrl-alt-del" },
-diff -NurpP --minimal linux-3.5/kernel/time/timekeeping.c linux-3.5-vs2.3.4/kernel/time/timekeeping.c
---- linux-3.5/kernel/time/timekeeping.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/time/timekeeping.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/time/timekeeping.c linux-3.5.1-vs2.3.4.1/kernel/time/timekeeping.c
+--- linux-3.5.1/kernel/time/timekeeping.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/time/timekeeping.c	2012-07-23 01:45:55.000000000 +0200
 @@ -254,6 +254,7 @@ void getnstimeofday(struct timespec *ts)
  	} while (read_seqretry(&timekeeper.lock, seq));
  
@@ -15213,9 +15213,9 @@ diff -NurpP --minimal linux-3.5/kernel/time/timekeeping.c linux-3.5-vs2.3.4/kern
  }
  EXPORT_SYMBOL(getnstimeofday);
  
-diff -NurpP --minimal linux-3.5/kernel/time.c linux-3.5-vs2.3.4/kernel/time.c
---- linux-3.5/kernel/time.c	2012-05-21 18:07:34.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/time.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/time.c linux-3.5.1-vs2.3.4.1/kernel/time.c
+--- linux-3.5.1/kernel/time.c	2012-05-21 18:07:34.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/time.c	2012-07-23 01:45:55.000000000 +0200
 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
  	if (err)
  		return err;
@@ -15234,9 +15234,9 @@ diff -NurpP --minimal linux-3.5/kernel/time.c linux-3.5-vs2.3.4/kernel/time.c
  	return 0;
  }
  
-diff -NurpP --minimal linux-3.5/kernel/timer.c linux-3.5-vs2.3.4/kernel/timer.c
---- linux-3.5/kernel/timer.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/timer.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/timer.c linux-3.5.1-vs2.3.4.1/kernel/timer.c
+--- linux-3.5.1/kernel/timer.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/timer.c	2012-07-23 01:45:55.000000000 +0200
 @@ -40,6 +40,10 @@
  #include <linux/irq_work.h>
  #include <linux/sched.h>
@@ -15286,9 +15286,9 @@ diff -NurpP --minimal linux-3.5/kernel/timer.c linux-3.5-vs2.3.4/kernel/timer.c
  SYSCALL_DEFINE0(getuid)
  {
  	/* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.5/kernel/user_namespace.c linux-3.5-vs2.3.4/kernel/user_namespace.c
---- linux-3.5/kernel/user_namespace.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/user_namespace.c	2012-07-23 03:38:28.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/user_namespace.c linux-3.5.1-vs2.3.4.1/kernel/user_namespace.c
+--- linux-3.5.1/kernel/user_namespace.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/user_namespace.c	2012-07-23 03:38:28.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/fs.h>
  #include <linux/uaccess.h>
@@ -15315,9 +15315,9 @@ diff -NurpP --minimal linux-3.5/kernel/user_namespace.c linux-3.5-vs2.3.4/kernel
  	put_user_ns(parent);
  }
  EXPORT_SYMBOL(free_user_ns);
-diff -NurpP --minimal linux-3.5/kernel/utsname.c linux-3.5-vs2.3.4/kernel/utsname.c
---- linux-3.5/kernel/utsname.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/kernel/utsname.c	2012-07-23 03:52:22.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/utsname.c linux-3.5.1-vs2.3.4.1/kernel/utsname.c
+--- linux-3.5.1/kernel/utsname.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/kernel/utsname.c	2012-07-23 03:52:22.000000000 +0200
 @@ -16,14 +16,17 @@
  #include <linux/slab.h>
  #include <linux/user_namespace.h>
@@ -15386,9 +15386,9 @@ diff -NurpP --minimal linux-3.5/kernel/utsname.c linux-3.5-vs2.3.4/kernel/utsnam
  	kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.5/kernel/vserver/Kconfig linux-3.5-vs2.3.4/kernel/vserver/Kconfig
---- linux-3.5/kernel/vserver/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/Kconfig linux-3.5.1-vs2.3.4.1/kernel/vserver/Kconfig
+--- linux-3.5.1/kernel/vserver/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,224 @@
 +#
 +# Linux VServer configuration
@@ -15614,9 +15614,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/Kconfig linux-3.5-vs2.3.4/kernel/
 +	bool
 +	default n
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/Makefile linux-3.5-vs2.3.4/kernel/vserver/Makefile
---- linux-3.5/kernel/vserver/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/Makefile	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/Makefile linux-3.5.1-vs2.3.4.1/kernel/vserver/Makefile
+--- linux-3.5.1/kernel/vserver/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/Makefile	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Linux vserver routines.
@@ -15636,9 +15636,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/Makefile linux-3.5-vs2.3.4/kernel
 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cacct.c linux-3.5-vs2.3.4/kernel/vserver/cacct.c
---- linux-3.5/kernel/vserver/cacct.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cacct.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cacct.c linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct.c
+--- linux-3.5.1/kernel/vserver/cacct.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,42 @@
 +/*
 + *  linux/kernel/vserver/cacct.c
@@ -15682,9 +15682,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cacct.c linux-3.5-vs2.3.4/kernel/
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_init.h linux-3.5-vs2.3.4/kernel/vserver/cacct_init.h
---- linux-3.5/kernel/vserver/cacct_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cacct_init.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cacct_init.h linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct_init.h
+--- linux-3.5.1/kernel/vserver/cacct_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct_init.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,25 @@
 +
 +
@@ -15711,9 +15711,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_init.h linux-3.5-vs2.3.4/ke
 +	return;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_proc.h linux-3.5-vs2.3.4/kernel/vserver/cacct_proc.h
---- linux-3.5/kernel/vserver/cacct_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cacct_proc.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cacct_proc.h linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct_proc.h
+--- linux-3.5.1/kernel/vserver/cacct_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cacct_proc.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CACCT_PROC_H
 +#define _VX_CACCT_PROC_H
@@ -15768,9 +15768,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cacct_proc.h linux-3.5-vs2.3.4/ke
 +}
 +
 +#endif	/* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.5/kernel/vserver/context.c linux-3.5-vs2.3.4/kernel/vserver/context.c
---- linux-3.5/kernel/vserver/context.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/context.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/context.c linux-3.5.1-vs2.3.4.1/kernel/vserver/context.c
+--- linux-3.5.1/kernel/vserver/context.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/context.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,1119 @@
 +/*
 + *  linux/kernel/vserver/context.c
@@ -16891,9 +16891,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/context.c linux-3.5-vs2.3.4/kerne
 +
 +EXPORT_SYMBOL_GPL(free_vx_info);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt.c linux-3.5-vs2.3.4/kernel/vserver/cvirt.c
---- linux-3.5/kernel/vserver/cvirt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cvirt.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cvirt.c linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt.c
+--- linux-3.5.1/kernel/vserver/cvirt.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,313 @@
 +/*
 + *  linux/kernel/vserver/cvirt.c
@@ -17208,9 +17208,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt.c linux-3.5-vs2.3.4/kernel/
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_init.h linux-3.5-vs2.3.4/kernel/vserver/cvirt_init.h
---- linux-3.5/kernel/vserver/cvirt_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cvirt_init.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cvirt_init.h linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt_init.h
+--- linux-3.5.1/kernel/vserver/cvirt_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt_init.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,70 @@
 +
 +
@@ -17282,9 +17282,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_init.h linux-3.5-vs2.3.4/ke
 +	return;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_proc.h linux-3.5-vs2.3.4/kernel/vserver/cvirt_proc.h
---- linux-3.5/kernel/vserver/cvirt_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/cvirt_proc.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/cvirt_proc.h linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt_proc.h
+--- linux-3.5.1/kernel/vserver/cvirt_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/cvirt_proc.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,123 @@
 +#ifndef _VX_CVIRT_PROC_H
 +#define _VX_CVIRT_PROC_H
@@ -17409,9 +17409,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/cvirt_proc.h linux-3.5-vs2.3.4/ke
 +}
 +
 +#endif	/* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.5/kernel/vserver/debug.c linux-3.5-vs2.3.4/kernel/vserver/debug.c
---- linux-3.5/kernel/vserver/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/debug.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/debug.c linux-3.5.1-vs2.3.4.1/kernel/vserver/debug.c
+--- linux-3.5.1/kernel/vserver/debug.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/debug.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,32 @@
 +/*
 + *  kernel/vserver/debug.c
@@ -17445,9 +17445,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/debug.c linux-3.5-vs2.3.4/kernel/
 +
 +EXPORT_SYMBOL_GPL(dump_vx_info);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/device.c linux-3.5-vs2.3.4/kernel/vserver/device.c
---- linux-3.5/kernel/vserver/device.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/device.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/device.c linux-3.5.1-vs2.3.4.1/kernel/vserver/device.c
+--- linux-3.5.1/kernel/vserver/device.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/device.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,443 @@
 +/*
 + *  linux/kernel/vserver/device.c
@@ -17892,9 +17892,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/device.c linux-3.5-vs2.3.4/kernel
 +#endif	/* CONFIG_COMPAT */
 +
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/dlimit.c linux-3.5-vs2.3.4/kernel/vserver/dlimit.c
---- linux-3.5/kernel/vserver/dlimit.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/dlimit.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/dlimit.c linux-3.5.1-vs2.3.4.1/kernel/vserver/dlimit.c
+--- linux-3.5.1/kernel/vserver/dlimit.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/dlimit.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,531 @@
 +/*
 + *  linux/kernel/vserver/dlimit.c
@@ -18427,9 +18427,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/dlimit.c linux-3.5-vs2.3.4/kernel
 +EXPORT_SYMBOL_GPL(locate_dl_info);
 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/helper.c linux-3.5-vs2.3.4/kernel/vserver/helper.c
---- linux-3.5/kernel/vserver/helper.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/helper.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/helper.c linux-3.5.1-vs2.3.4.1/kernel/vserver/helper.c
+--- linux-3.5.1/kernel/vserver/helper.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/helper.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,228 @@
 +/*
 + *  linux/kernel/vserver/helper.c
@@ -18659,9 +18659,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/helper.c linux-3.5-vs2.3.4/kernel
 +	return do_vshelper(vshelper_path, argv, envp, 1);
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/history.c linux-3.5-vs2.3.4/kernel/vserver/history.c
---- linux-3.5/kernel/vserver/history.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/history.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/history.c linux-3.5.1-vs2.3.4.1/kernel/vserver/history.c
+--- linux-3.5.1/kernel/vserver/history.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/history.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,258 @@
 +/*
 + *  kernel/vserver/history.c
@@ -18921,9 +18921,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/history.c linux-3.5-vs2.3.4/kerne
 +
 +#endif	/* CONFIG_COMPAT */
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/inet.c linux-3.5-vs2.3.4/kernel/vserver/inet.c
---- linux-3.5/kernel/vserver/inet.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/inet.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/inet.c linux-3.5.1-vs2.3.4.1/kernel/vserver/inet.c
+--- linux-3.5.1/kernel/vserver/inet.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/inet.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,226 @@
 +
 +#include <linux/in.h>
@@ -19151,9 +19151,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/inet.c linux-3.5-vs2.3.4/kernel/v
 +
 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/init.c linux-3.5-vs2.3.4/kernel/vserver/init.c
---- linux-3.5/kernel/vserver/init.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/init.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/init.c linux-3.5.1-vs2.3.4.1/kernel/vserver/init.c
+--- linux-3.5.1/kernel/vserver/init.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/init.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + *  linux/kernel/init.c
@@ -19200,9 +19200,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/init.c linux-3.5-vs2.3.4/kernel/v
 +module_init(init_vserver);
 +module_exit(exit_vserver);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/inode.c linux-3.5-vs2.3.4/kernel/vserver/inode.c
---- linux-3.5/kernel/vserver/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/inode.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/inode.c linux-3.5.1-vs2.3.4.1/kernel/vserver/inode.c
+--- linux-3.5.1/kernel/vserver/inode.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/inode.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,437 @@
 +/*
 + *  linux/kernel/vserver/inode.c
@@ -19641,10 +19641,10 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/inode.c linux-3.5-vs2.3.4/kernel/
 +
 +#endif	/* CONFIG_PROPAGATE */
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/vserver/limit.c
---- linux-3.5/kernel/vserver/limit.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/limit.c	2012-07-23 01:45:55.000000000 +0200
-@@ -0,0 +1,330 @@
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/limit.c linux-3.5.1-vs2.3.4.1/kernel/vserver/limit.c
+--- linux-3.5.1/kernel/vserver/limit.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/limit.c	2012-08-09 19:58:03.000000000 +0200
+@@ -0,0 +1,345 @@
 +/*
 + *  linux/kernel/vserver/limit.c
 + *
@@ -19905,11 +19905,13 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +void vx_vsi_meminfo(struct sysinfo *val)
 +{
 +#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
-+	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++	struct mem_cgroup *mcg;
 +	u64 res_limit, res_usage;
 +
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
 +	if (!mcg)
-+		return;
++		goto out;
 +
 +	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
 +	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
@@ -19920,6 +19922,8 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +	val->bufferram = 0;
 +	val->totalhigh = 0;
 +	val->freehigh = 0;
++out:
++	rcu_read_unlock();
 +#endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
 +	return;
 +}
@@ -19928,12 +19932,14 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +{
 +#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
 +#ifdef	CONFIG_CGROUP_MEM_RES_CTLR_SWAP
-+	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++	struct mem_cgroup *mcg;
 +	u64 res_limit, res_usage, memsw_limit, memsw_usage;
 +	s64 swap_limit, swap_usage;
 +
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
 +	if (!mcg)
-+		return;
++		goto out;
 +
 +	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
 +	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
@@ -19942,7 +19948,7 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +
 +	/* memory unlimited */
 +	if (res_limit == RESOURCE_MAX)
-+		return;
++		goto out;
 +
 +	swap_limit = memsw_limit - res_limit;
 +	/* we have a swap limit? */
@@ -19956,6 +19962,8 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +	/* total shown minus usage gives free swap */
 +	val->freeswap = (swap_usage < swap_limit) ?
 +		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
++out:
++	rcu_read_unlock();
 +#else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
 +	val->totalswap = 0;
 +	val->freeswap = 0;
@@ -19966,18 +19974,25 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit.c linux-3.5-vs2.3.4/kernel/
 +
 +long vx_vsi_cached(struct sysinfo *val)
 +{
++	long cache = 0;
 +#ifdef	CONFIG_CGROUP_MEM_RES_CTLR
-+	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
++	struct mem_cgroup *mcg;
 +
-+	return mem_cgroup_stat_read_cache(mcg);
-+#else
-+	return 0;
++	rcu_read_lock();
++	mcg = mem_cgroup_from_task(current);
++	if (!mcg)
++		goto out;
++
++	cache = mem_cgroup_stat_read_cache(mcg);
++out:
++	rcu_read_unlock();
 +#endif
++	return cache;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/limit_init.h linux-3.5-vs2.3.4/kernel/vserver/limit_init.h
---- linux-3.5/kernel/vserver/limit_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/limit_init.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/limit_init.h linux-3.5.1-vs2.3.4.1/kernel/vserver/limit_init.h
+--- linux-3.5.1/kernel/vserver/limit_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/limit_init.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,31 @@
 +
 +
@@ -20010,9 +20025,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit_init.h linux-3.5-vs2.3.4/ke
 +	}
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/limit_proc.h linux-3.5-vs2.3.4/kernel/vserver/limit_proc.h
---- linux-3.5/kernel/vserver/limit_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/limit_proc.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/limit_proc.h linux-3.5.1-vs2.3.4.1/kernel/vserver/limit_proc.h
+--- linux-3.5.1/kernel/vserver/limit_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/limit_proc.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,57 @@
 +#ifndef _VX_LIMIT_PROC_H
 +#define _VX_LIMIT_PROC_H
@@ -20071,9 +20086,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/limit_proc.h linux-3.5-vs2.3.4/ke
 +#endif	/* _VX_LIMIT_PROC_H */
 +
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/network.c linux-3.5-vs2.3.4/kernel/vserver/network.c
---- linux-3.5/kernel/vserver/network.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/network.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/network.c linux-3.5.1-vs2.3.4.1/kernel/vserver/network.c
+--- linux-3.5.1/kernel/vserver/network.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/network.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,912 @@
 +/*
 + *  linux/kernel/vserver/network.c
@@ -20987,9 +21002,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/network.c linux-3.5-vs2.3.4/kerne
 +EXPORT_SYMBOL_GPL(free_nx_info);
 +EXPORT_SYMBOL_GPL(unhash_nx_info);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/proc.c linux-3.5-vs2.3.4/kernel/vserver/proc.c
---- linux-3.5/kernel/vserver/proc.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/proc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/proc.c linux-3.5.1-vs2.3.4.1/kernel/vserver/proc.c
+--- linux-3.5.1/kernel/vserver/proc.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/proc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,1103 @@
 +/*
 + *  linux/kernel/vserver/proc.c
@@ -22094,9 +22109,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/proc.c linux-3.5-vs2.3.4/kernel/v
 +	return buffer - orig;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/sched.c linux-3.5-vs2.3.4/kernel/vserver/sched.c
---- linux-3.5/kernel/vserver/sched.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/sched.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/sched.c linux-3.5.1-vs2.3.4.1/kernel/vserver/sched.c
+--- linux-3.5.1/kernel/vserver/sched.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/sched.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,83 @@
 +/*
 + *  linux/kernel/vserver/sched.c
@@ -22181,9 +22196,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/sched.c linux-3.5-vs2.3.4/kernel/
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/sched_init.h linux-3.5-vs2.3.4/kernel/vserver/sched_init.h
---- linux-3.5/kernel/vserver/sched_init.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/sched_init.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/sched_init.h linux-3.5.1-vs2.3.4.1/kernel/vserver/sched_init.h
+--- linux-3.5.1/kernel/vserver/sched_init.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/sched_init.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,27 @@
 +
 +static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -22212,9 +22227,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/sched_init.h linux-3.5-vs2.3.4/ke
 +{
 +	return;
 +}
-diff -NurpP --minimal linux-3.5/kernel/vserver/sched_proc.h linux-3.5-vs2.3.4/kernel/vserver/sched_proc.h
---- linux-3.5/kernel/vserver/sched_proc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/sched_proc.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/sched_proc.h linux-3.5.1-vs2.3.4.1/kernel/vserver/sched_proc.h
+--- linux-3.5.1/kernel/vserver/sched_proc.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/sched_proc.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,32 @@
 +#ifndef _VX_SCHED_PROC_H
 +#define _VX_SCHED_PROC_H
@@ -22248,9 +22263,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/sched_proc.h linux-3.5-vs2.3.4/ke
 +}
 +
 +#endif	/* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.5/kernel/vserver/signal.c linux-3.5-vs2.3.4/kernel/vserver/signal.c
---- linux-3.5/kernel/vserver/signal.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/signal.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/signal.c linux-3.5.1-vs2.3.4.1/kernel/vserver/signal.c
+--- linux-3.5.1/kernel/vserver/signal.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/signal.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,134 @@
 +/*
 + *  linux/kernel/vserver/signal.c
@@ -22386,9 +22401,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/signal.c linux-3.5-vs2.3.4/kernel
 +	return ret;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/space.c linux-3.5-vs2.3.4/kernel/vserver/space.c
---- linux-3.5/kernel/vserver/space.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/space.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/space.c linux-3.5.1-vs2.3.4.1/kernel/vserver/space.c
+--- linux-3.5.1/kernel/vserver/space.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/space.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,436 @@
 +/*
 + *  linux/kernel/vserver/space.c
@@ -22826,9 +22841,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/space.c linux-3.5-vs2.3.4/kernel/
 +	return 0;
 +}
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/switch.c linux-3.5-vs2.3.4/kernel/vserver/switch.c
---- linux-3.5/kernel/vserver/switch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/switch.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/switch.c linux-3.5.1-vs2.3.4.1/kernel/vserver/switch.c
+--- linux-3.5.1/kernel/vserver/switch.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/switch.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,556 @@
 +/*
 + *  linux/kernel/vserver/switch.c
@@ -23386,9 +23401,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/switch.c linux-3.5-vs2.3.4/kernel
 +}
 +
 +#endif	/* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.5/kernel/vserver/sysctl.c linux-3.5-vs2.3.4/kernel/vserver/sysctl.c
---- linux-3.5/kernel/vserver/sysctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/sysctl.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/sysctl.c linux-3.5.1-vs2.3.4.1/kernel/vserver/sysctl.c
+--- linux-3.5.1/kernel/vserver/sysctl.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/sysctl.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,247 @@
 +/*
 + *  kernel/vserver/sysctl.c
@@ -23637,9 +23652,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/sysctl.c linux-3.5-vs2.3.4/kernel
 +EXPORT_SYMBOL_GPL(vs_debug_perm);
 +EXPORT_SYMBOL_GPL(vs_debug_misc);
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/tag.c linux-3.5-vs2.3.4/kernel/vserver/tag.c
---- linux-3.5/kernel/vserver/tag.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/tag.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/tag.c linux-3.5.1-vs2.3.4.1/kernel/vserver/tag.c
+--- linux-3.5.1/kernel/vserver/tag.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/tag.c	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,63 @@
 +/*
 + *  linux/kernel/vserver/tag.c
@@ -23704,9 +23719,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/tag.c linux-3.5-vs2.3.4/kernel/vs
 +}
 +
 +
-diff -NurpP --minimal linux-3.5/kernel/vserver/vci_config.h linux-3.5-vs2.3.4/kernel/vserver/vci_config.h
---- linux-3.5/kernel/vserver/vci_config.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/kernel/vserver/vci_config.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/kernel/vserver/vci_config.h linux-3.5.1-vs2.3.4.1/kernel/vserver/vci_config.h
+--- linux-3.5.1/kernel/vserver/vci_config.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/kernel/vserver/vci_config.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,76 @@
 +
 +/*  interface version */
@@ -23784,9 +23799,9 @@ diff -NurpP --minimal linux-3.5/kernel/vserver/vci_config.h linux-3.5-vs2.3.4/ke
 +	0;
 +}
 +
-diff -NurpP --minimal linux-3.5/mm/memcontrol.c linux-3.5-vs2.3.4/mm/memcontrol.c
---- linux-3.5/mm/memcontrol.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/memcontrol.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/memcontrol.c linux-3.5.1-vs2.3.4.1/mm/memcontrol.c
+--- linux-3.5.1/mm/memcontrol.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/memcontrol.c	2012-07-23 01:45:55.000000000 +0200
 @@ -883,6 +883,31 @@ struct mem_cgroup *mem_cgroup_from_task(
  				struct mem_cgroup, css);
  }
@@ -23819,9 +23834,9 @@ diff -NurpP --minimal linux-3.5/mm/memcontrol.c linux-3.5-vs2.3.4/mm/memcontrol.
  struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
  {
  	struct mem_cgroup *memcg = NULL;
-diff -NurpP --minimal linux-3.5/mm/oom_kill.c linux-3.5-vs2.3.4/mm/oom_kill.c
---- linux-3.5/mm/oom_kill.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/oom_kill.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/oom_kill.c linux-3.5.1-vs2.3.4.1/mm/oom_kill.c
+--- linux-3.5.1/mm/oom_kill.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/oom_kill.c	2012-07-23 01:45:55.000000000 +0200
 @@ -35,6 +35,8 @@
  #include <linux/freezer.h>
  #include <linux/ftrace.h>
@@ -23896,9 +23911,9 @@ diff -NurpP --minimal linux-3.5/mm/oom_kill.c linux-3.5-vs2.3.4/mm/oom_kill.c
  	}
  	if (PTR_ERR(p) != -1UL) {
  		oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.5/mm/page_alloc.c linux-3.5-vs2.3.4/mm/page_alloc.c
---- linux-3.5/mm/page_alloc.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/page_alloc.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/page_alloc.c linux-3.5.1-vs2.3.4.1/mm/page_alloc.c
+--- linux-3.5.1/mm/page_alloc.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/page_alloc.c	2012-07-23 01:45:55.000000000 +0200
 @@ -59,6 +59,8 @@
  #include <linux/prefetch.h>
  #include <linux/migrate.h>
@@ -23928,9 +23943,9 @@ diff -NurpP --minimal linux-3.5/mm/page_alloc.c linux-3.5-vs2.3.4/mm/page_alloc.
  }
  #endif
  
-diff -NurpP --minimal linux-3.5/mm/pgtable-generic.c linux-3.5-vs2.3.4/mm/pgtable-generic.c
---- linux-3.5/mm/pgtable-generic.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/pgtable-generic.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/pgtable-generic.c linux-3.5.1-vs2.3.4.1/mm/pgtable-generic.c
+--- linux-3.5.1/mm/pgtable-generic.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/pgtable-generic.c	2012-07-23 01:45:55.000000000 +0200
 @@ -6,6 +6,8 @@
   *  Copyright (C) 2010  Linus Torvalds
   */
@@ -23940,9 +23955,9 @@ diff -NurpP --minimal linux-3.5/mm/pgtable-generic.c linux-3.5-vs2.3.4/mm/pgtabl
  #include <linux/pagemap.h>
  #include <asm/tlb.h>
  #include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.5/mm/shmem.c linux-3.5-vs2.3.4/mm/shmem.c
---- linux-3.5/mm/shmem.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/shmem.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/shmem.c linux-3.5.1-vs2.3.4.1/mm/shmem.c
+--- linux-3.5.1/mm/shmem.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/shmem.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1812,7 +1812,7 @@ static int shmem_statfs(struct dentry *d
  {
  	struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -23961,9 +23976,9 @@ diff -NurpP --minimal linux-3.5/mm/shmem.c linux-3.5-vs2.3.4/mm/shmem.c
  	sb->s_op = &shmem_ops;
  	sb->s_time_gran = 1;
  #ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.5/mm/slab.c linux-3.5-vs2.3.4/mm/slab.c
---- linux-3.5/mm/slab.c	2012-05-21 18:07:35.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/slab.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/slab.c linux-3.5.1-vs2.3.4.1/mm/slab.c
+--- linux-3.5.1/mm/slab.c	2012-05-21 18:07:35.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/slab.c	2012-07-23 01:45:55.000000000 +0200
 @@ -413,6 +413,8 @@ static void kmem_list3_init(struct kmem_
  #define STATS_INC_FREEMISS(x)	do { } while (0)
  #endif
@@ -23997,9 +24012,9 @@ diff -NurpP --minimal linux-3.5/mm/slab.c linux-3.5-vs2.3.4/mm/slab.c
  
  	kmemcheck_slab_free(cachep, objp, obj_size(cachep));
  
-diff -NurpP --minimal linux-3.5/mm/slab_vs.h linux-3.5-vs2.3.4/mm/slab_vs.h
---- linux-3.5/mm/slab_vs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.5-vs2.3.4/mm/slab_vs.h	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/slab_vs.h linux-3.5.1-vs2.3.4.1/mm/slab_vs.h
+--- linux-3.5.1/mm/slab_vs.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/mm/slab_vs.h	2012-07-23 01:45:55.000000000 +0200
 @@ -0,0 +1,29 @@
 +
 +#include <linux/vserver/context.h>
@@ -24030,9 +24045,9 @@ diff -NurpP --minimal linux-3.5/mm/slab_vs.h linux-3.5-vs2.3.4/mm/slab_vs.h
 +	atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
 +}
 +
-diff -NurpP --minimal linux-3.5/mm/swapfile.c linux-3.5-vs2.3.4/mm/swapfile.c
---- linux-3.5/mm/swapfile.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/mm/swapfile.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/mm/swapfile.c linux-3.5.1-vs2.3.4.1/mm/swapfile.c
+--- linux-3.5.1/mm/swapfile.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/mm/swapfile.c	2012-07-23 01:45:55.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <asm/tlbflush.h>
  #include <linux/swapops.h>
@@ -24067,9 +24082,9 @@ diff -NurpP --minimal linux-3.5/mm/swapfile.c linux-3.5-vs2.3.4/mm/swapfile.c
  }
  
  /*
-diff -NurpP --minimal linux-3.5/net/bridge/br_multicast.c linux-3.5-vs2.3.4/net/bridge/br_multicast.c
---- linux-3.5/net/bridge/br_multicast.c	2012-07-22 23:39:47.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/bridge/br_multicast.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/bridge/br_multicast.c linux-3.5.1-vs2.3.4.1/net/bridge/br_multicast.c
+--- linux-3.5.1/net/bridge/br_multicast.c	2012-07-22 23:39:47.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/bridge/br_multicast.c	2012-07-23 01:45:55.000000000 +0200
 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
  	ip6h->hop_limit = 1;
  	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -24079,9 +24094,9 @@ diff -NurpP --minimal linux-3.5/net/bridge/br_multicast.c linux-3.5-vs2.3.4/net/
  		kfree_skb(skb);
  		return NULL;
  	}
-diff -NurpP --minimal linux-3.5/net/core/dev.c linux-3.5-vs2.3.4/net/core/dev.c
---- linux-3.5/net/core/dev.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/core/dev.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/core/dev.c linux-3.5.1-vs2.3.4.1/net/core/dev.c
+--- linux-3.5.1/net/core/dev.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/core/dev.c	2012-07-23 01:45:55.000000000 +0200
 @@ -126,6 +126,7 @@
  #include <linux/in.h>
  #include <linux/jhash.h>
@@ -24199,10 +24214,10 @@ diff -NurpP --minimal linux-3.5/net/core/dev.c linux-3.5-vs2.3.4/net/core/dev.c
  	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.5/net/core/rtnetlink.c linux-3.5-vs2.3.4/net/core/rtnetlink.c
---- linux-3.5/net/core/rtnetlink.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/core/rtnetlink.c	2012-07-23 01:45:55.000000000 +0200
-@@ -1079,6 +1079,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
+diff -NurpP --minimal linux-3.5.1/net/core/rtnetlink.c linux-3.5.1-vs2.3.4.1/net/core/rtnetlink.c
+--- linux-3.5.1/net/core/rtnetlink.c	2012-08-11 15:13:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/core/rtnetlink.c	2012-08-11 15:15:02.000000000 +0200
+@@ -1085,6 +1085,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
  		hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
  			if (idx < s_idx)
  				goto cont;
@@ -24211,7 +24226,7 @@ diff -NurpP --minimal linux-3.5/net/core/rtnetlink.c linux-3.5-vs2.3.4/net/core/
  			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
  					     NETLINK_CB(cb->skb).pid,
  					     cb->nlh->nlmsg_seq, 0,
-@@ -1960,6 +1962,9 @@ void rtmsg_ifinfo(int type, struct net_d
+@@ -1966,6 +1968,9 @@ void rtmsg_ifinfo(int type, struct net_d
  	int err = -ENOBUFS;
  	size_t if_info_size;
  
@@ -24221,9 +24236,9 @@ diff -NurpP --minimal linux-3.5/net/core/rtnetlink.c linux-3.5-vs2.3.4/net/core/
  	skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL);
  	if (skb == NULL)
  		goto errout;
-diff -NurpP --minimal linux-3.5/net/core/sock.c linux-3.5-vs2.3.4/net/core/sock.c
---- linux-3.5/net/core/sock.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/core/sock.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/core/sock.c linux-3.5.1-vs2.3.4.1/net/core/sock.c
+--- linux-3.5.1/net/core/sock.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/core/sock.c	2012-07-23 01:45:55.000000000 +0200
 @@ -132,6 +132,10 @@
  #include <net/netprio_cgroup.h>
  
@@ -24291,9 +24306,9 @@ diff -NurpP --minimal linux-3.5/net/core/sock.c linux-3.5-vs2.3.4/net/core/sock.
  	/*
  	 * Before updating sk_refcnt, we must commit prior changes to memory
  	 * (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.5/net/ipv4/af_inet.c linux-3.5-vs2.3.4/net/ipv4/af_inet.c
---- linux-3.5/net/ipv4/af_inet.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/af_inet.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/af_inet.c linux-3.5.1-vs2.3.4.1/net/ipv4/af_inet.c
+--- linux-3.5.1/net/ipv4/af_inet.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/af_inet.c	2012-07-23 01:45:55.000000000 +0200
 @@ -118,6 +118,7 @@
  #ifdef CONFIG_IP_MROUTE
  #include <linux/mroute.h>
@@ -24371,9 +24386,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/af_inet.c linux-3.5-vs2.3.4/net/ipv4/af
  		sin->sin_port = inet->inet_sport;
  		sin->sin_addr.s_addr = addr;
  	}
-diff -NurpP --minimal linux-3.5/net/ipv4/arp.c linux-3.5-vs2.3.4/net/ipv4/arp.c
---- linux-3.5/net/ipv4/arp.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/arp.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/arp.c linux-3.5.1-vs2.3.4.1/net/ipv4/arp.c
+--- linux-3.5.1/net/ipv4/arp.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/arp.c	2012-07-23 01:45:55.000000000 +0200
 @@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc
  	struct net_device *dev = n->dev;
  	int hatype = dev->type;
@@ -24390,9 +24405,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/arp.c linux-3.5-vs2.3.4/net/ipv4/arp.c
  	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.5/net/ipv4/devinet.c linux-3.5-vs2.3.4/net/ipv4/devinet.c
---- linux-3.5/net/ipv4/devinet.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/devinet.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/devinet.c linux-3.5.1-vs2.3.4.1/net/ipv4/devinet.c
+--- linux-3.5.1/net/ipv4/devinet.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/devinet.c	2012-07-23 01:45:55.000000000 +0200
 @@ -516,6 +516,7 @@ struct in_device *inetdev_by_index(struc
  }
  EXPORT_SYMBOL(inetdev_by_index);
@@ -24459,9 +24474,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/devinet.c linux-3.5-vs2.3.4/net/ipv4/de
  				if (ip_idx < s_ip_idx)
  					continue;
  				if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.5/net/ipv4/fib_trie.c linux-3.5-vs2.3.4/net/ipv4/fib_trie.c
---- linux-3.5/net/ipv4/fib_trie.c	2012-05-21 18:07:40.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/fib_trie.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/fib_trie.c linux-3.5.1-vs2.3.4.1/net/ipv4/fib_trie.c
+--- linux-3.5.1/net/ipv4/fib_trie.c	2012-05-21 18:07:40.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/fib_trie.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2556,6 +2556,7 @@ static int fib_route_seq_show(struct seq
  			    || fa->fa_type == RTN_MULTICAST)
  				continue;
@@ -24470,9 +24485,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/fib_trie.c linux-3.5-vs2.3.4/net/ipv4/f
  			if (fi)
  				seq_printf(seq,
  					 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
-diff -NurpP --minimal linux-3.5/net/ipv4/inet_connection_sock.c linux-3.5-vs2.3.4/net/ipv4/inet_connection_sock.c
---- linux-3.5/net/ipv4/inet_connection_sock.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/inet_connection_sock.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/inet_connection_sock.c linux-3.5.1-vs2.3.4.1/net/ipv4/inet_connection_sock.c
+--- linux-3.5.1/net/ipv4/inet_connection_sock.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/inet_connection_sock.c	2012-07-23 01:45:55.000000000 +0200
 @@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low,
  }
  EXPORT_SYMBOL(inet_get_local_port_range);
@@ -24522,9 +24537,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/inet_connection_sock.c linux-3.5-vs2.3.
  					break;
  			}
  			if (!relax && reuse && sk2->sk_reuse &&
-diff -NurpP --minimal linux-3.5/net/ipv4/inet_diag.c linux-3.5-vs2.3.4/net/ipv4/inet_diag.c
---- linux-3.5/net/ipv4/inet_diag.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/inet_diag.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/inet_diag.c linux-3.5.1-vs2.3.4.1/net/ipv4/inet_diag.c
+--- linux-3.5.1/net/ipv4/inet_diag.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/inet_diag.c	2012-07-23 01:45:55.000000000 +0200
 @@ -31,6 +31,8 @@
  
  #include <linux/inet.h>
@@ -24635,9 +24650,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/inet_diag.c linux-3.5-vs2.3.4/net/ipv4/
  				if (num < s_num)
  					goto next_dying;
  				if (r->sdiag_family != AF_UNSPEC &&
-diff -NurpP --minimal linux-3.5/net/ipv4/inet_hashtables.c linux-3.5-vs2.3.4/net/ipv4/inet_hashtables.c
---- linux-3.5/net/ipv4/inet_hashtables.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/inet_hashtables.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/inet_hashtables.c linux-3.5.1-vs2.3.4.1/net/ipv4/inet_hashtables.c
+--- linux-3.5.1/net/ipv4/inet_hashtables.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/inet_hashtables.c	2012-07-23 01:45:55.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
@@ -24674,9 +24689,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/inet_hashtables.c linux-3.5-vs2.3.4/net
  	/*
  	 * 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.5/net/ipv4/netfilter/nf_nat_helper.c linux-3.5-vs2.3.4/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.5/net/ipv4/netfilter/nf_nat_helper.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.5-vs2.3.4/net/ipv4/netfilter/nf_nat_helper.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.5.1-vs2.3.4.1/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.5.1/net/ipv4/netfilter/nf_nat_helper.c	2012-03-19 19:47:33.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/netfilter/nf_nat_helper.c	2012-07-23 01:45:55.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <net/route.h>
  
@@ -24685,9 +24700,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/netfilter/nf_nat_helper.c linux-3.5-vs2
  #include <net/netfilter/nf_conntrack.h>
  #include <net/netfilter/nf_conntrack_helper.h>
  #include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.5/net/ipv4/netfilter.c linux-3.5-vs2.3.4/net/ipv4/netfilter.c
---- linux-3.5/net/ipv4/netfilter.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/netfilter.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/netfilter.c linux-3.5.1-vs2.3.4.1/net/ipv4/netfilter.c
+--- linux-3.5.1/net/ipv4/netfilter.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/netfilter.c	2012-07-23 01:45:55.000000000 +0200
 @@ -6,7 +6,7 @@
  #include <linux/skbuff.h>
  #include <linux/gfp.h>
@@ -24697,9 +24712,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/netfilter.c linux-3.5-vs2.3.4/net/ipv4/
  #include <net/xfrm.h>
  #include <net/ip.h>
  #include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.5/net/ipv4/raw.c linux-3.5-vs2.3.4/net/ipv4/raw.c
---- linux-3.5/net/ipv4/raw.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/raw.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/raw.c linux-3.5.1-vs2.3.4.1/net/ipv4/raw.c
+--- linux-3.5.1/net/ipv4/raw.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/raw.c	2012-07-23 01:45:55.000000000 +0200
 @@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru
  
  		if (net_eq(sock_net(sk), net) && inet->inet_num == num	&&
@@ -24792,9 +24807,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/raw.c linux-3.5-vs2.3.4/net/ipv4/raw.c
  
  	if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
  		sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.5/net/ipv4/route.c linux-3.5-vs2.3.4/net/ipv4/route.c
---- linux-3.5/net/ipv4/route.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/route.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/route.c linux-3.5.1-vs2.3.4.1/net/ipv4/route.c
+--- linux-3.5.1/net/ipv4/route.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/route.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2690,7 +2690,7 @@ static struct rtable *ip_route_output_sl
  
  
@@ -24804,9 +24819,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/route.c linux-3.5-vs2.3.4/net/ipv4/rout
  		rth = ERR_PTR(-ENODEV);
  		if (dev_out == NULL)
  			goto out;
-diff -NurpP --minimal linux-3.5/net/ipv4/tcp.c linux-3.5-vs2.3.4/net/ipv4/tcp.c
---- linux-3.5/net/ipv4/tcp.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/tcp.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/tcp.c linux-3.5.1-vs2.3.4.1/net/ipv4/tcp.c
+--- linux-3.5.1/net/ipv4/tcp.c	2012-08-11 15:13:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/tcp.c	2012-08-11 15:15:02.000000000 +0200
 @@ -268,6 +268,7 @@
  #include <linux/crypto.h>
  #include <linux/time.h>
@@ -24815,9 +24830,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/tcp.c linux-3.5-vs2.3.4/net/ipv4/tcp.c
  
  #include <net/icmp.h>
  #include <net/tcp.h>
-diff -NurpP --minimal linux-3.5/net/ipv4/tcp_ipv4.c linux-3.5-vs2.3.4/net/ipv4/tcp_ipv4.c
---- linux-3.5/net/ipv4/tcp_ipv4.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/tcp_ipv4.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/tcp_ipv4.c linux-3.5.1-vs2.3.4.1/net/ipv4/tcp_ipv4.c
+--- linux-3.5.1/net/ipv4/tcp_ipv4.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/tcp_ipv4.c	2012-07-23 01:45:55.000000000 +0200
 @@ -2005,6 +2005,12 @@ static void *listening_get_next(struct s
  		req = req->dl_next;
  		while (1) {
@@ -24923,9 +24938,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/tcp_ipv4.c linux-3.5-vs2.3.4/net/ipv4/t
  	destp = ntohs(tw->tw_dport);
  	srcp  = ntohs(tw->tw_sport);
  
-diff -NurpP --minimal linux-3.5/net/ipv4/tcp_minisocks.c linux-3.5-vs2.3.4/net/ipv4/tcp_minisocks.c
---- linux-3.5/net/ipv4/tcp_minisocks.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/tcp_minisocks.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/tcp_minisocks.c linux-3.5.1-vs2.3.4.1/net/ipv4/tcp_minisocks.c
+--- linux-3.5.1/net/ipv4/tcp_minisocks.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/tcp_minisocks.c	2012-07-23 01:45:55.000000000 +0200
 @@ -23,6 +23,9 @@
  #include <linux/slab.h>
  #include <linux/sysctl.h>
@@ -24948,9 +24963,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/tcp_minisocks.c linux-3.5-vs2.3.4/net/i
  #if IS_ENABLED(CONFIG_IPV6)
  		if (tw->tw_family == PF_INET6) {
  			struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.5/net/ipv4/udp.c linux-3.5-vs2.3.4/net/ipv4/udp.c
---- linux-3.5/net/ipv4/udp.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv4/udp.c	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv4/udp.c linux-3.5.1-vs2.3.4.1/net/ipv4/udp.c
+--- linux-3.5.1/net/ipv4/udp.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv4/udp.c	2012-07-23 01:45:55.000000000 +0200
 @@ -299,14 +299,7 @@ fail:
  }
  EXPORT_SYMBOL(udp_lib_get_port);
@@ -25083,9 +25098,9 @@ diff -NurpP --minimal linux-3.5/net/ipv4/udp.c linux-3.5-vs2.3.4/net/ipv4/udp.c
  	__u16 destp	  = ntohs(inet->inet_dport);
  	__u16 srcp	  = ntohs(inet->inet_sport);
  
-diff -NurpP --minimal linux-3.5/net/ipv6/Kconfig linux-3.5-vs2.3.4/net/ipv6/Kconfig
---- linux-3.5/net/ipv6/Kconfig	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/Kconfig	2012-07-23 01:45:55.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/Kconfig linux-3.5.1-vs2.3.4.1/net/ipv6/Kconfig
+--- linux-3.5.1/net/ipv6/Kconfig	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/Kconfig	2012-07-23 01:45:55.000000000 +0200
 @@ -4,8 +4,8 @@
  
  #   IPv6 as module will cause a CRASH if you try to unload it
@@ -25097,9 +25112,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/Kconfig linux-3.5-vs2.3.4/net/ipv6/Kcon
  	---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.5/net/ipv6/addrconf.c linux-3.5-vs2.3.4/net/ipv6/addrconf.c
---- linux-3.5/net/ipv6/addrconf.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/addrconf.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/addrconf.c linux-3.5.1-vs2.3.4.1/net/ipv6/addrconf.c
+--- linux-3.5.1/net/ipv6/addrconf.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/addrconf.c	2012-07-23 01:45:56.000000000 +0200
 @@ -91,6 +91,8 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
@@ -25199,9 +25214,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/addrconf.c linux-3.5-vs2.3.4/net/ipv6/a
  			idev = __in6_dev_get(dev);
  			if (!idev)
  				goto cont;
-diff -NurpP --minimal linux-3.5/net/ipv6/af_inet6.c linux-3.5-vs2.3.4/net/ipv6/af_inet6.c
---- linux-3.5/net/ipv6/af_inet6.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/af_inet6.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/af_inet6.c linux-3.5.1-vs2.3.4.1/net/ipv6/af_inet6.c
+--- linux-3.5.1/net/ipv6/af_inet6.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/af_inet6.c	2012-07-23 01:45:56.000000000 +0200
 @@ -43,6 +43,8 @@
  #include <linux/netdevice.h>
  #include <linux/icmpv6.h>
@@ -25297,9 +25312,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/af_inet6.c linux-3.5-vs2.3.4/net/ipv6/a
  		if (ipv6_addr_any(&np->rcv_saddr))
  			sin->sin6_addr = np->saddr;
  		else
-diff -NurpP --minimal linux-3.5/net/ipv6/datagram.c linux-3.5-vs2.3.4/net/ipv6/datagram.c
---- linux-3.5/net/ipv6/datagram.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/datagram.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/datagram.c linux-3.5.1-vs2.3.4.1/net/ipv6/datagram.c
+--- linux-3.5.1/net/ipv6/datagram.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/datagram.c	2012-07-23 01:45:56.000000000 +0200
 @@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s
  
  			rcu_read_lock();
@@ -25309,9 +25324,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/datagram.c linux-3.5-vs2.3.4/net/ipv6/d
  				if (!dev) {
  					rcu_read_unlock();
  					return -ENODEV;
-diff -NurpP --minimal linux-3.5/net/ipv6/fib6_rules.c linux-3.5-vs2.3.4/net/ipv6/fib6_rules.c
---- linux-3.5/net/ipv6/fib6_rules.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/fib6_rules.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/fib6_rules.c linux-3.5.1-vs2.3.4.1/net/ipv6/fib6_rules.c
+--- linux-3.5.1/net/ipv6/fib6_rules.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/fib6_rules.c	2012-07-23 01:45:56.000000000 +0200
 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
  					       ip6_dst_idev(&rt->dst)->dev,
  					       &flp6->daddr,
@@ -25321,9 +25336,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/fib6_rules.c linux-3.5-vs2.3.4/net/ipv6
  				goto again;
  			if (!ipv6_prefix_equal(&saddr, &r->src.addr,
  					       r->src.plen))
-diff -NurpP --minimal linux-3.5/net/ipv6/inet6_hashtables.c linux-3.5-vs2.3.4/net/ipv6/inet6_hashtables.c
---- linux-3.5/net/ipv6/inet6_hashtables.c	2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/inet6_hashtables.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/inet6_hashtables.c linux-3.5.1-vs2.3.4.1/net/ipv6/inet6_hashtables.c
+--- linux-3.5.1/net/ipv6/inet6_hashtables.c	2011-10-24 18:45:34.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/inet6_hashtables.c	2012-07-23 01:45:56.000000000 +0200
 @@ -16,6 +16,7 @@
  
  #include <linux/module.h>
@@ -25359,9 +25374,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/inet6_hashtables.c linux-3.5-vs2.3.4/ne
  		}
  		if (sk->sk_bound_dev_if) {
  			if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.5/net/ipv6/ip6_output.c linux-3.5-vs2.3.4/net/ipv6/ip6_output.c
---- linux-3.5/net/ipv6/ip6_output.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/ip6_output.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/ip6_output.c linux-3.5.1-vs2.3.4.1/net/ipv6/ip6_output.c
+--- linux-3.5.1/net/ipv6/ip6_output.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/ip6_output.c	2012-07-23 01:45:56.000000000 +0200
 @@ -973,7 +973,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,
@@ -25372,9 +25387,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/ip6_output.c linux-3.5-vs2.3.4/net/ipv6
  		if (err)
  			goto out_err_release;
  	}
-diff -NurpP --minimal linux-3.5/net/ipv6/ndisc.c linux-3.5-vs2.3.4/net/ipv6/ndisc.c
---- linux-3.5/net/ipv6/ndisc.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/ndisc.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/ndisc.c linux-3.5.1-vs2.3.4.1/net/ipv6/ndisc.c
+--- linux-3.5.1/net/ipv6/ndisc.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/ndisc.c	2012-07-23 01:45:56.000000000 +0200
 @@ -562,7 +562,7 @@ static void ndisc_send_na(struct net_dev
  	} else {
  		if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -25384,9 +25399,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/ndisc.c linux-3.5-vs2.3.4/net/ipv6/ndis
  			return;
  		src_addr = &tmpaddr;
  	}
-diff -NurpP --minimal linux-3.5/net/ipv6/raw.c linux-3.5-vs2.3.4/net/ipv6/raw.c
---- linux-3.5/net/ipv6/raw.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/raw.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/raw.c linux-3.5.1-vs2.3.4.1/net/ipv6/raw.c
+--- linux-3.5.1/net/ipv6/raw.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/raw.c	2012-07-23 01:45:56.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <linux/icmpv6.h>
  #include <linux/netfilter.h>
@@ -25409,9 +25424,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/raw.c linux-3.5-vs2.3.4/net/ipv6/raw.c
  		/* ipv4 addr of the socket is invalid.  Only the
  		 * unspecified and mapped address have a v4 equivalent.
  		 */
-diff -NurpP --minimal linux-3.5/net/ipv6/route.c linux-3.5-vs2.3.4/net/ipv6/route.c
---- linux-3.5/net/ipv6/route.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/route.c	2012-07-23 10:25:43.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/route.c linux-3.5.1-vs2.3.4.1/net/ipv6/route.c
+--- linux-3.5.1/net/ipv6/route.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/route.c	2012-07-23 10:25:43.000000000 +0200
 @@ -57,6 +57,7 @@
  #include <net/xfrm.h>
  #include <net/netevent.h>
@@ -25459,9 +25474,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/route.c linux-3.5-vs2.3.4/net/ipv6/rout
  	seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen);
  
  #ifdef CONFIG_IPV6_SUBTREES
-diff -NurpP --minimal linux-3.5/net/ipv6/tcp_ipv6.c linux-3.5-vs2.3.4/net/ipv6/tcp_ipv6.c
---- linux-3.5/net/ipv6/tcp_ipv6.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/tcp_ipv6.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/tcp_ipv6.c linux-3.5.1-vs2.3.4.1/net/ipv6/tcp_ipv6.c
+--- linux-3.5.1/net/ipv6/tcp_ipv6.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/tcp_ipv6.c	2012-07-23 01:45:56.000000000 +0200
 @@ -71,6 +71,7 @@
  
  #include <linux/crypto.h>
@@ -25488,9 +25503,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/tcp_ipv6.c linux-3.5-vs2.3.4/net/ipv6/t
  
  	addr_type = ipv6_addr_type(&usin->sin6_addr);
  
-diff -NurpP --minimal linux-3.5/net/ipv6/udp.c linux-3.5-vs2.3.4/net/ipv6/udp.c
---- linux-3.5/net/ipv6/udp.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/udp.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/udp.c linux-3.5.1-vs2.3.4.1/net/ipv6/udp.c
+--- linux-3.5.1/net/ipv6/udp.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/udp.c	2012-07-23 01:45:56.000000000 +0200
 @@ -45,41 +45,67 @@
  #include <net/tcp_states.h>
  #include <net/ip6_checksum.h>
@@ -25583,9 +25598,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/udp.c linux-3.5-vs2.3.4/net/ipv6/udp.c
  		}
  		if (!ipv6_addr_any(&np->daddr)) {
  			if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.5/net/ipv6/xfrm6_policy.c linux-3.5-vs2.3.4/net/ipv6/xfrm6_policy.c
---- linux-3.5/net/ipv6/xfrm6_policy.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/ipv6/xfrm6_policy.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/ipv6/xfrm6_policy.c linux-3.5.1-vs2.3.4.1/net/ipv6/xfrm6_policy.c
+--- linux-3.5.1/net/ipv6/xfrm6_policy.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/ipv6/xfrm6_policy.c	2012-07-23 01:45:56.000000000 +0200
 @@ -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,
@@ -25595,9 +25610,9 @@ diff -NurpP --minimal linux-3.5/net/ipv6/xfrm6_policy.c linux-3.5-vs2.3.4/net/ip
  	dst_release(dst);
  	return 0;
  }
-diff -NurpP --minimal linux-3.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.5-vs2.3.4/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.5/net/netfilter/ipvs/ip_vs_xmit.c	2012-03-19 19:47:33.000000000 +0100
-+++ linux-3.5-vs2.3.4/net/netfilter/ipvs/ip_vs_xmit.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.5.1-vs2.3.4.1/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.5.1/net/netfilter/ipvs/ip_vs_xmit.c	2012-03-19 19:47:33.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/net/netfilter/ipvs/ip_vs_xmit.c	2012-07-23 01:45:56.000000000 +0200
 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
  		return dst;
  	if (ipv6_addr_any(&fl6.saddr) &&
@@ -25607,9 +25622,9 @@ diff -NurpP --minimal linux-3.5/net/netfilter/ipvs/ip_vs_xmit.c linux-3.5-vs2.3.
  		goto out_err;
  	if (do_xfrm) {
  		dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.5/net/netlink/af_netlink.c linux-3.5-vs2.3.4/net/netlink/af_netlink.c
---- linux-3.5/net/netlink/af_netlink.c	2012-07-22 23:39:48.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/netlink/af_netlink.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/netlink/af_netlink.c linux-3.5.1-vs2.3.4.1/net/netlink/af_netlink.c
+--- linux-3.5.1/net/netlink/af_netlink.c	2012-07-22 23:39:48.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/netlink/af_netlink.c	2012-07-23 01:45:56.000000000 +0200
 @@ -55,6 +55,9 @@
  #include <linux/types.h>
  #include <linux/audit.h>
@@ -25649,9 +25664,9 @@ diff -NurpP --minimal linux-3.5/net/netlink/af_netlink.c linux-3.5-vs2.3.4/net/n
  				s = sk_next(s);
  			if (s) {
  				iter->link = i;
-diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
---- linux-3.5/net/socket.c	2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/socket.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/socket.c linux-3.5.1-vs2.3.4.1/net/socket.c
+--- linux-3.5.1/net/socket.c	2012-08-11 15:13:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/socket.c	2012-08-11 15:15:02.000000000 +0200
 @@ -98,6 +98,10 @@
  
  #include <net/sock.h>
@@ -25663,7 +25678,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  
  #include <linux/if_tun.h>
  #include <linux/ipv6_route.h>
-@@ -548,6 +552,7 @@ static inline int __sock_sendmsg_nosec(s
+@@ -551,6 +555,7 @@ static inline int __sock_sendmsg_nosec(s
  				       struct msghdr *msg, size_t size)
  {
  	struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25671,7 +25686,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  
  	sock_update_classid(sock->sk);
  
-@@ -558,7 +563,22 @@ static inline int __sock_sendmsg_nosec(s
+@@ -561,7 +566,22 @@ static inline int __sock_sendmsg_nosec(s
  	si->msg = msg;
  	si->size = size;
  
@@ -25695,7 +25710,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  }
  
  static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-@@ -714,6 +734,7 @@ static inline int __sock_recvmsg_nosec(s
+@@ -717,6 +737,7 @@ static inline int __sock_recvmsg_nosec(s
  				       struct msghdr *msg, size_t size, int flags)
  {
  	struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -25703,7 +25718,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  
  	sock_update_classid(sock->sk);
  
-@@ -723,7 +744,18 @@ static inline int __sock_recvmsg_nosec(s
+@@ -726,7 +747,18 @@ static inline int __sock_recvmsg_nosec(s
  	si->size = size;
  	si->flags = flags;
  
@@ -25723,7 +25738,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  }
  
  static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-@@ -1208,6 +1240,13 @@ int __sock_create(struct net *net, int f
+@@ -1211,6 +1243,13 @@ int __sock_create(struct net *net, int f
  	if (type < 0 || type >= SOCK_MAX)
  		return -EINVAL;
  
@@ -25737,7 +25752,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  	/* Compatibility.
  
  	   This uglymoron is moved from INET layer to here to avoid
-@@ -1342,6 +1381,7 @@ SYSCALL_DEFINE3(socket, int, family, int
+@@ -1345,6 +1384,7 @@ SYSCALL_DEFINE3(socket, int, family, int
  	if (retval < 0)
  		goto out;
  
@@ -25745,7 +25760,7 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  	retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK));
  	if (retval < 0)
  		goto out_release;
-@@ -1383,10 +1423,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
+@@ -1386,10 +1426,12 @@ SYSCALL_DEFINE4(socketpair, int, family,
  	err = sock_create(family, type, protocol, &sock1);
  	if (err < 0)
  		goto out;
@@ -25758,9 +25773,9 @@ diff -NurpP --minimal linux-3.5/net/socket.c linux-3.5-vs2.3.4/net/socket.c
  
  	err = sock1->ops->socketpair(sock1, sock2);
  	if (err < 0)
-diff -NurpP --minimal linux-3.5/net/sunrpc/auth.c linux-3.5-vs2.3.4/net/sunrpc/auth.c
---- linux-3.5/net/sunrpc/auth.c	2011-10-24 18:45:34.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/sunrpc/auth.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/sunrpc/auth.c linux-3.5.1-vs2.3.4.1/net/sunrpc/auth.c
+--- linux-3.5.1/net/sunrpc/auth.c	2011-10-24 18:45:34.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/sunrpc/auth.c	2012-07-23 01:45:56.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/hash.h>
  #include <linux/sunrpc/clnt.h>
@@ -25785,9 +25800,9 @@ diff -NurpP --minimal linux-3.5/net/sunrpc/auth.c linux-3.5-vs2.3.4/net/sunrpc/a
  	};
  
  	dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.5/net/sunrpc/auth_unix.c linux-3.5-vs2.3.4/net/sunrpc/auth_unix.c
---- linux-3.5/net/sunrpc/auth_unix.c	2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/sunrpc/auth_unix.c	2012-07-23 10:26:39.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/sunrpc/auth_unix.c linux-3.5.1-vs2.3.4.1/net/sunrpc/auth_unix.c
+--- linux-3.5.1/net/sunrpc/auth_unix.c	2012-07-22 23:39:49.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/sunrpc/auth_unix.c	2012-07-23 10:26:39.000000000 +0200
 @@ -13,11 +13,13 @@
  #include <linux/sunrpc/clnt.h>
  #include <linux/sunrpc/auth.h>
@@ -25845,9 +25860,9 @@ diff -NurpP --minimal linux-3.5/net/sunrpc/auth_unix.c linux-3.5-vs2.3.4/net/sun
  	hold = p++;
  	for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
  		*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.5/net/sunrpc/clnt.c linux-3.5-vs2.3.4/net/sunrpc/clnt.c
---- linux-3.5/net/sunrpc/clnt.c	2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/sunrpc/clnt.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/sunrpc/clnt.c linux-3.5.1-vs2.3.4.1/net/sunrpc/clnt.c
+--- linux-3.5.1/net/sunrpc/clnt.c	2012-07-22 23:39:49.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/sunrpc/clnt.c	2012-07-23 01:45:56.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/in6.h>
  #include <linux/un.h>
@@ -25866,9 +25881,9 @@ diff -NurpP --minimal linux-3.5/net/sunrpc/clnt.c linux-3.5-vs2.3.4/net/sunrpc/c
  	return clnt;
  }
  EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.5/net/unix/af_unix.c linux-3.5-vs2.3.4/net/unix/af_unix.c
---- linux-3.5/net/unix/af_unix.c	2012-07-22 23:39:49.000000000 +0200
-+++ linux-3.5-vs2.3.4/net/unix/af_unix.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/net/unix/af_unix.c linux-3.5.1-vs2.3.4.1/net/unix/af_unix.c
+--- linux-3.5.1/net/unix/af_unix.c	2012-07-22 23:39:49.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/net/unix/af_unix.c	2012-07-23 01:45:56.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <linux/mount.h>
  #include <net/checksum.h>
@@ -25906,9 +25921,9 @@ diff -NurpP --minimal linux-3.5/net/unix/af_unix.c linux-3.5-vs2.3.4/net/unix/af
  		sk = next_unix_socket(&iter->i, sk);
  	return sk;
  }
-diff -NurpP --minimal linux-3.5/scripts/checksyscalls.sh linux-3.5-vs2.3.4/scripts/checksyscalls.sh
---- linux-3.5/scripts/checksyscalls.sh	2012-03-19 19:47:34.000000000 +0100
-+++ linux-3.5-vs2.3.4/scripts/checksyscalls.sh	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/scripts/checksyscalls.sh linux-3.5.1-vs2.3.4.1/scripts/checksyscalls.sh
+--- linux-3.5.1/scripts/checksyscalls.sh	2012-03-19 19:47:34.000000000 +0100
++++ linux-3.5.1-vs2.3.4.1/scripts/checksyscalls.sh	2012-07-23 01:45:56.000000000 +0200
 @@ -193,7 +193,6 @@ cat << EOF
  #define __IGNORE_afs_syscall
  #define __IGNORE_getpmsg
@@ -25917,9 +25932,9 @@ diff -NurpP --minimal linux-3.5/scripts/checksyscalls.sh linux-3.5-vs2.3.4/scrip
  EOF
  }
  
-diff -NurpP --minimal linux-3.5/security/commoncap.c linux-3.5-vs2.3.4/security/commoncap.c
---- linux-3.5/security/commoncap.c	2012-07-22 23:39:51.000000000 +0200
-+++ linux-3.5-vs2.3.4/security/commoncap.c	2012-07-23 11:05:45.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/security/commoncap.c linux-3.5.1-vs2.3.4.1/security/commoncap.c
+--- linux-3.5.1/security/commoncap.c	2012-07-22 23:39:51.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/security/commoncap.c	2012-07-23 11:05:45.000000000 +0200
 @@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st
  int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
  		int cap, int audit)
@@ -25961,9 +25976,9 @@ diff -NurpP --minimal linux-3.5/security/commoncap.c linux-3.5-vs2.3.4/security/
  		return -EPERM;
  	return 0;
  }
-diff -NurpP --minimal linux-3.5/security/selinux/hooks.c linux-3.5-vs2.3.4/security/selinux/hooks.c
---- linux-3.5/security/selinux/hooks.c	2012-07-22 23:39:52.000000000 +0200
-+++ linux-3.5-vs2.3.4/security/selinux/hooks.c	2012-07-23 01:45:56.000000000 +0200
+diff -NurpP --minimal linux-3.5.1/security/selinux/hooks.c linux-3.5.1-vs2.3.4.1/security/selinux/hooks.c
+--- linux-3.5.1/security/selinux/hooks.c	2012-08-11 15:13:45.000000000 +0200
++++ linux-3.5.1-vs2.3.4.1/security/selinux/hooks.c	2012-08-11 15:15:02.000000000 +0200
 @@ -66,7 +66,6 @@
  #include <linux/dccp.h>
  #include <linux/quota.h>
@@ -25972,90 +25987,3 @@ diff -NurpP --minimal linux-3.5/security/selinux/hooks.c linux-3.5-vs2.3.4/secur
  #include <linux/parser.h>
  #include <linux/nfs_mount.h>
  #include <net/ipv6.h>
-diff -NurpP --minimal linux-3.5-vs2.3.4/kernel/vserver/limit.c linux-3.5-vs2.3.4.1/kernel/vserver/limit.c
---- linux-3.5-vs2.3.4/kernel/vserver/limit.c	2012-07-23 01:45:55.000000000 +0200
-+++ linux-3.5-vs2.3.4.1/kernel/vserver/limit.c	2012-08-09 19:58:03.000000000 +0200
-@@ -258,11 +258,13 @@ int vc_rlimit_stat(struct vx_info *vxi, 
- void vx_vsi_meminfo(struct sysinfo *val)
- {
- #ifdef	CONFIG_CGROUP_MEM_RES_CTLR
--	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
-+	struct mem_cgroup *mcg;
- 	u64 res_limit, res_usage;
- 
-+	rcu_read_lock();
-+	mcg = mem_cgroup_from_task(current);
- 	if (!mcg)
--		return;
-+		goto out;
- 
- 	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
- 	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
-@@ -273,6 +275,8 @@ void vx_vsi_meminfo(struct sysinfo *val)
- 	val->bufferram = 0;
- 	val->totalhigh = 0;
- 	val->freehigh = 0;
-+out:
-+	rcu_read_unlock();
- #endif	/* CONFIG_CGROUP_MEM_RES_CTLR */
- 	return;
- }
-@@ -281,12 +285,14 @@ void vx_vsi_swapinfo(struct sysinfo *val
- {
- #ifdef	CONFIG_CGROUP_MEM_RES_CTLR
- #ifdef	CONFIG_CGROUP_MEM_RES_CTLR_SWAP
--	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
-+	struct mem_cgroup *mcg;
- 	u64 res_limit, res_usage, memsw_limit, memsw_usage;
- 	s64 swap_limit, swap_usage;
- 
-+	rcu_read_lock();
-+	mcg = mem_cgroup_from_task(current);
- 	if (!mcg)
--		return;
-+		goto out;
- 
- 	res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT);
- 	res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE);
-@@ -295,7 +301,7 @@ void vx_vsi_swapinfo(struct sysinfo *val
- 
- 	/* memory unlimited */
- 	if (res_limit == RESOURCE_MAX)
--		return;
-+		goto out;
- 
- 	swap_limit = memsw_limit - res_limit;
- 	/* we have a swap limit? */
-@@ -309,6 +315,8 @@ void vx_vsi_swapinfo(struct sysinfo *val
- 	/* total shown minus usage gives free swap */
- 	val->freeswap = (swap_usage < swap_limit) ?
- 		val->totalswap - (swap_usage >> PAGE_SHIFT) : 0;
-+out:
-+	rcu_read_unlock();
- #else	/* !CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
- 	val->totalswap = 0;
- 	val->freeswap = 0;
-@@ -319,12 +327,19 @@ void vx_vsi_swapinfo(struct sysinfo *val
- 
- long vx_vsi_cached(struct sysinfo *val)
- {
-+	long cache = 0;
- #ifdef	CONFIG_CGROUP_MEM_RES_CTLR
--	struct mem_cgroup *mcg = mem_cgroup_from_task(current);
-+	struct mem_cgroup *mcg;
- 
--	return mem_cgroup_stat_read_cache(mcg);
--#else
--	return 0;
-+	rcu_read_lock();
-+	mcg = mem_cgroup_from_task(current);
-+	if (!mcg)
-+		goto out;
-+
-+	cache = mem_cgroup_stat_read_cache(mcg);
-+out:
-+	rcu_read_unlock();
- #endif
-+	return cache;
- }
- 


More information about the pld-cvs-commit mailing list