[packages/kernel/LINUX_2_6_32] up to 2.6.32.60
glen
glen at pld-linux.org
Sun Nov 9 22:42:22 CET 2014
commit aa0fbfe3b87ec9bee3aad4aeedb90b53d3c20e3d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Mar 16 23:44:48 2013 +0200
up to 2.6.32.60
kernel-vserver-2.3.patch | 2716 +++++++++++++++++++++++-----------------------
kernel.spec | 6 +-
2 files changed, 1361 insertions(+), 1361 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 5b5ff15..0c2bc7a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -114,7 +114,7 @@
%endif
%define basever 2.6.32
-%define postver .58
+%define postver .60
%define rel 1
%define _enable_debug_packages 0
@@ -158,7 +158,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
# Source0-md5: 260551284ac224c3a43c4adac7df4879
%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v%{basever}/patch-%{version}.bz2
-# Source1-md5: a32385ccb645eea5bb33e88adb4af5b8
+# Source1-md5: 1718e3b1caff13c1e731e257c4c4120b
%endif
Source3: kernel-autoconf.h
@@ -271,7 +271,7 @@ Patch85: kernel-hostap.patch
# Taken from http://download.opensuse.org/factory/repo/src-oss/suse/src/kernel-source-2.6.30-10.3.src.rpm
Patch90: kernel-mpt-fusion.patch
-# based on http://vserver.13thfloor.at/Experimental/patch-2.6.32.8-vs2.3.0.36.29.1.diff
+# based on http://vserver.13thfloor.at/Experimental/patch-2.6.32.60-vs2.3.0.36.29.9.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 dcf5df3..13ded11 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.32.59/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt
---- linux-2.6.32.59/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/Documentation/scheduler/sched-cfs-hard-limits.txt linux-2.6.32.60-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt
+--- linux-2.6.32.60/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/Documentation/scheduler/sched-cfs-hard-limits.txt 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,48 @@
+CPU HARD LIMITS FOR CFS GROUPS
+==============================
@@ -50,9 +50,9 @@ diff -NurpP --minimal linux-2.6.32.59/Documentation/scheduler/sched-cfs-hard-lim
+# cd 1/
+# echo 250000 > cfs_runtime_us /* set a 250ms runtime or limit */
+# echo 500000 > cfs_period_us /* set a 500ms period */
-diff -NurpP --minimal linux-2.6.32.59/Documentation/vserver/debug.txt linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/vserver/debug.txt
---- linux-2.6.32.59/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/Documentation/vserver/debug.txt 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/Documentation/vserver/debug.txt linux-2.6.32.60-vs2.3.0.36.29.9/Documentation/vserver/debug.txt
+--- linux-2.6.32.60/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/Documentation/vserver/debug.txt 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,154 @@
+
+debug_cvirt:
@@ -208,9 +208,9 @@ diff -NurpP --minimal linux-2.6.32.59/Documentation/vserver/debug.txt linux-2.6.
+ 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-2.6.32.59/arch/alpha/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/Kconfig
---- linux-2.6.32.59/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/Kconfig
+--- linux-2.6.32.60/arch/alpha/Kconfig 2009-12-03 20:01:49.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -674,6 +674,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -220,9 +220,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/Kconfig linux-2.6.32.59-vs2.3.0
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S
---- linux-2.6.32.59/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/kernel/entry.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S
+--- linux-2.6.32.60/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -255,9 +255,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/entry.S linux-2.6.32.59-
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/osf_sys.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.59/arch/alpha/kernel/osf_sys.c 2012-03-20 11:26:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/kernel/osf_sys.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.60/arch/alpha/kernel/osf_sys.c 2012-10-20 11:49:37.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/osf_sys.c 2011-11-17 12:18:26.000000000 +0100
@@ -865,7 +865,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
@@ -267,9 +267,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/osf_sys.c linux-2.6.32.5
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c
---- linux-2.6.32.59/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/kernel/ptrace.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c
+--- linux-2.6.32.60/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -278,9 +278,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/ptrace.c linux-2.6.32.59
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/systbls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S
---- linux-2.6.32.59/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/kernel/systbls.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S
+--- linux-2.6.32.60/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/systbls.S 2011-06-10 13:03:02.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -290,9 +290,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/systbls.S linux-2.6.32.5
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c
---- linux-2.6.32.59/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c
+--- linux-2.6.32.60/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -303,9 +303,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/kernel/traps.c linux-2.6.32.59-
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.32.59/arch/alpha/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/mm/fault.c
---- linux-2.6.32.59/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/alpha/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/alpha/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/mm/fault.c
+--- linux-2.6.32.60/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/alpha/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -317,9 +317,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/alpha/mm/fault.c linux-2.6.32.59-vs2.
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.59/arch/arm/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/Kconfig
---- linux-2.6.32.59/arch/arm/Kconfig 2012-03-20 11:26:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/Kconfig 2012-01-10 09:18:12.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/arm/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/Kconfig
+--- linux-2.6.32.60/arch/arm/Kconfig 2012-10-20 11:49:37.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/Kconfig 2012-01-10 09:18:12.000000000 +0100
@@ -1536,6 +1536,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -329,9 +329,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/arm/Kconfig linux-2.6.32.59-vs2.3.0.3
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/arm/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h
---- linux-2.6.32.59/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/arm/include/asm/tlb.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h
+--- linux-2.6.32.60/arch/arm/include/asm/tlb.h 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -27,6 +27,7 @@
#else /* !CONFIG_MMU */
@@ -340,9 +340,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/arm/include/asm/tlb.h linux-2.6.32.59
#include <asm/pgalloc.h>
/*
-diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/calls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/calls.S
---- linux-2.6.32.59/arch/arm/kernel/calls.S 2012-03-20 11:26:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/calls.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/arm/kernel/calls.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/calls.S
+--- linux-2.6.32.60/arch/arm/kernel/calls.S 2012-10-20 11:49:37.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/calls.S 2011-06-10 13:03:02.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -352,9 +352,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/calls.S linux-2.6.32.59-vs
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/process.c
---- linux-2.6.32.59/arch/arm/kernel/process.c 2012-03-20 11:26:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/process.c 2012-01-10 09:18:12.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/arm/kernel/process.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/process.c
+--- linux-2.6.32.60/arch/arm/kernel/process.c 2012-10-20 11:49:37.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/process.c 2012-01-10 09:18:12.000000000 +0100
@@ -272,7 +272,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -365,9 +365,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/process.c linux-2.6.32.59-
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/traps.c
---- linux-2.6.32.59/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/arm/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/arm/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/traps.c
+--- linux-2.6.32.60/arch/arm/kernel/traps.c 2009-12-03 20:01:50.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/arm/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -234,8 +234,8 @@ static void __die(const char *str, int e
sysfs_printk_last_file();
print_modules();
@@ -379,9 +379,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/arm/kernel/traps.c linux-2.6.32.59-vs
if (!user_mode(regs) || in_interrupt()) {
dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.32.59/arch/avr32/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/avr32/mm/fault.c
---- linux-2.6.32.59/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/avr32/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/avr32/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/avr32/mm/fault.c
+--- linux-2.6.32.60/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/avr32/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -216,7 +216,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -392,9 +392,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/avr32/mm/fault.c linux-2.6.32.59-vs2.
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/cris/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/Kconfig
---- linux-2.6.32.59/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/cris/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/cris/Kconfig
+--- linux-2.6.32.60/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/cris/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -404,9 +404,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/cris/Kconfig linux-2.6.32.59-vs2.3.0.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/cris/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/mm/fault.c
---- linux-2.6.32.59/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/cris/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/cris/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/cris/mm/fault.c
+--- linux-2.6.32.60/arch/cris/mm/fault.c 2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/cris/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
out_of_memory:
@@ -417,9 +417,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/cris/mm/fault.c linux-2.6.32.59-vs2.3
if (user_mode(regs))
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/frv/kernel/kernel_thread.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S
---- linux-2.6.32.59/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/frv/kernel/kernel_thread.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.32.60/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/frv/kernel/kernel_thread.S 2011-06-10 13:03:02.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -429,9 +429,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/frv/kernel/kernel_thread.S linux-2.6.
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.32.59/arch/frv/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/mm/fault.c
---- linux-2.6.32.59/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/frv/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/frv/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/frv/mm/fault.c
+--- linux-2.6.32.60/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/frv/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
*/
out_of_memory:
@@ -442,9 +442,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/frv/mm/fault.c linux-2.6.32.59-vs2.3.
if (user_mode(__frame))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/h8300/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/h8300/Kconfig
---- linux-2.6.32.59/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/h8300/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/h8300/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/h8300/Kconfig
+--- linux-2.6.32.60/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/h8300/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -454,9 +454,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/h8300/Kconfig linux-2.6.32.59-vs2.3.0
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/Kconfig
---- linux-2.6.32.59/arch/ia64/Kconfig 2012-03-20 11:26:01.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/Kconfig 2012-03-23 18:34:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/Kconfig
+--- linux-2.6.32.60/arch/ia64/Kconfig 2012-10-20 11:49:38.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/Kconfig 2012-03-23 18:34:19.000000000 +0100
@@ -668,6 +668,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -466,9 +466,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/Kconfig linux-2.6.32.59-vs2.3.0.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/ia32/ia32_entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.32.59/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/ia32/ia32_entry.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.32.60/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/ia32/ia32_entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -478,9 +478,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/ia32/ia32_entry.S linux-2.6.32.5
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h
---- linux-2.6.32.59/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/include/asm/tlb.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h
+--- linux-2.6.32.60/arch/ia64/include/asm/tlb.h 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -489,9 +489,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/include/asm/tlb.h linux-2.6.32.5
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S
---- linux-2.6.32.59/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/kernel/entry.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S
+--- linux-2.6.32.60/arch/ia64/kernel/entry.S 2012-10-20 11:49:38.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/entry.S 2012-10-20 12:08:59.000000000 +0200
@@ -1753,7 +1753,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -501,9 +501,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/entry.S linux-2.6.32.59-v
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/perfmon.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c
---- linux-2.6.32.59/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/kernel/perfmon.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c
+--- linux-2.6.32.60/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/perfmon.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -521,9 +521,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/perfmon.c linux-2.6.32.59
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/process.c
---- linux-2.6.32.59/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/kernel/process.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/process.c
+--- linux-2.6.32.60/arch/ia64/kernel/process.c 2009-12-03 20:01:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -535,9 +535,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/process.c linux-2.6.32.59
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-2.6.32.59/arch/ia64/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c
---- linux-2.6.32.59/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/kernel/ptrace.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c
+--- linux-2.6.32.60/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -546,9 +546,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/ptrace.c linux-2.6.32.59-
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c
---- linux-2.6.32.59/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c
+--- linux-2.6.32.60/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -573,9 +573,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/kernel/traps.c linux-2.6.32.59-v
}
}
}
-diff -NurpP --minimal linux-2.6.32.59/arch/ia64/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/mm/fault.c
---- linux-2.6.32.59/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/ia64/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/ia64/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/mm/fault.c
+--- linux-2.6.32.60/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/ia64/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -594,9 +594,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/ia64/mm/fault.c linux-2.6.32.59-vs2.3
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/m32r/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c
---- linux-2.6.32.59/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m32r/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c
+--- linux-2.6.32.60/arch/m32r/kernel/traps.c 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m32r/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -609,9 +609,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m32r/kernel/traps.c linux-2.6.32.59-v
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.32.59/arch/m32r/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/mm/fault.c
---- linux-2.6.32.59/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m32r/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m32r/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m32r/mm/fault.c
+--- linux-2.6.32.60/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m32r/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -276,7 +276,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -622,9 +622,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m32r/mm/fault.c linux-2.6.32.59-vs2.3
if (error_code & ACE_USERMODE)
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/m68k/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/Kconfig
---- linux-2.6.32.59/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68k/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/Kconfig
+--- linux-2.6.32.60/arch/m68k/Kconfig 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -622,6 +622,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -634,9 +634,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68k/Kconfig linux-2.6.32.59-vs2.3.0.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c
---- linux-2.6.32.59/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68k/kernel/ptrace.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c
+--- linux-2.6.32.60/arch/m68k/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
@@ -654,9 +654,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/ptrace.c linux-2.6.32.59-
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c
---- linux-2.6.32.59/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68k/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c
+--- linux-2.6.32.60/arch/m68k/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -906,8 +906,8 @@ void show_registers(struct pt_regs *regs
printk("d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
regs->d4, regs->d5, regs->a0, regs->a1);
@@ -668,9 +668,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68k/kernel/traps.c linux-2.6.32.59-v
addr = (unsigned long)&fp->un;
printk("Frame format=%X ", regs->format);
switch (regs->format) {
-diff -NurpP --minimal linux-2.6.32.59/arch/m68k/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/mm/fault.c
---- linux-2.6.32.59/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68k/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68k/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/mm/fault.c
+--- linux-2.6.32.60/arch/m68k/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68k/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -186,7 +186,8 @@ out_of_memory:
goto survive;
}
@@ -681,9 +681,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68k/mm/fault.c linux-2.6.32.59-vs2.3
if (user_mode(regs))
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/Kconfig
---- linux-2.6.32.59/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68knommu/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68knommu/Kconfig
+--- linux-2.6.32.60/arch/m68knommu/Kconfig 2009-12-03 20:01:57.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68knommu/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -727,6 +727,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -693,9 +693,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/Kconfig linux-2.6.32.59-vs2
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c
---- linux-2.6.32.59/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/m68knommu/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c
+--- linux-2.6.32.60/arch/m68knommu/kernel/traps.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/m68knommu/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -78,8 +78,9 @@ void die_if_kernel(char *str, struct pt_
printk(KERN_EMERG "d4: %08lx d5: %08lx a0: %08lx a1: %08lx\n",
fp->d4, fp->d5, fp->a0, fp->a1);
@@ -708,9 +708,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/m68knommu/kernel/traps.c linux-2.6.32
show_stack(NULL, (unsigned long *)(fp + 1));
add_taint(TAINT_DIE);
do_exit(SIGSEGV);
-diff -NurpP --minimal linux-2.6.32.59/arch/microblaze/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c
---- linux-2.6.32.59/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/microblaze/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c
+--- linux-2.6.32.60/arch/microblaze/mm/fault.c 2009-09-10 15:25:24.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/microblaze/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -279,7 +279,8 @@ out_of_memory:
goto survive;
}
@@ -721,9 +721,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/microblaze/mm/fault.c linux-2.6.32.59
if (user_mode(regs))
do_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/Kconfig
---- linux-2.6.32.59/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/Kconfig
+--- linux-2.6.32.60/arch/mips/Kconfig 2009-12-03 20:01:58.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -2188,6 +2188,8 @@ source "fs/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -733,9 +733,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/Kconfig linux-2.6.32.59-vs2.3.0.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c
---- linux-2.6.32.59/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/ptrace.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c
+--- linux-2.6.32.60/arch/mips/kernel/ptrace.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/ptrace.c 2011-06-10 13:03:02.000000000 +0200
@@ -25,6 +25,7 @@
#include <linux/security.h>
#include <linux/audit.h>
@@ -754,9 +754,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/ptrace.c linux-2.6.32.59-
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-2.6.32.59/arch/mips/kernel/scall32-o32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S
---- linux-2.6.32.59/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/scall32-o32.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.32.60/arch/mips/kernel/scall32-o32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall32-o32.S 2011-06-10 13:03:02.000000000 +0200
@@ -525,7 +525,7 @@ einval: li v0, -ENOSYS
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -766,9 +766,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall32-o32.S linux-2.6.3
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-64.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S
---- linux-2.6.32.59/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/scall64-64.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S
+--- linux-2.6.32.60/arch/mips/kernel/scall64-64.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-64.S 2011-06-10 13:03:02.000000000 +0200
@@ -362,7 +362,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -778,9 +778,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-64.S linux-2.6.32
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-n32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S
---- linux-2.6.32.59/arch/mips/kernel/scall64-n32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/scall64-n32.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.32.60/arch/mips/kernel/scall64-n32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-n32.S 2011-06-10 13:03:02.000000000 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -790,9 +790,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-n32.S linux-2.6.3
PTR compat_sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-o32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S
---- linux-2.6.32.59/arch/mips/kernel/scall64-o32.S 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/scall64-o32.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.32.60/arch/mips/kernel/scall64-o32.S 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/scall64-o32.S 2011-06-10 13:03:02.000000000 +0200
@@ -480,7 +480,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -802,9 +802,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/scall64-o32.S linux-2.6.3
PTR sys_32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/traps.c
---- linux-2.6.32.59/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mips/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mips/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/traps.c
+--- linux-2.6.32.60/arch/mips/kernel/traps.c 2009-12-03 20:01:59.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mips/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -335,9 +335,10 @@ void show_registers(const struct pt_regs
__show_regs(regs);
@@ -819,9 +819,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mips/kernel/traps.c linux-2.6.32.59-v
if (cpu_has_userlocal) {
unsigned long tls;
-diff -NurpP --minimal linux-2.6.32.59/arch/mn10300/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c
---- linux-2.6.32.59/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/mn10300/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c
+--- linux-2.6.32.60/arch/mn10300/mm/fault.c 2009-09-10 15:25:39.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/mn10300/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -339,7 +339,8 @@ no_context:
out_of_memory:
up_read(&mm->mmap_sem);
@@ -832,9 +832,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/mn10300/mm/fault.c linux-2.6.32.59-vs
if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
do_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/parisc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/Kconfig
---- linux-2.6.32.59/arch/parisc/Kconfig 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/parisc/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/Kconfig
+--- linux-2.6.32.60/arch/parisc/Kconfig 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -294,6 +294,8 @@ source "fs/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -844,9 +844,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/parisc/Kconfig linux-2.6.32.59-vs2.3.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/syscall_table.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S
---- linux-2.6.32.59/arch/parisc/kernel/syscall_table.S 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/parisc/kernel/syscall_table.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.32.60/arch/parisc/kernel/syscall_table.S 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/kernel/syscall_table.S 2011-06-10 13:03:02.000000000 +0200
@@ -361,7 +361,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -856,9 +856,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/syscall_table.S linux-2
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c
---- linux-2.6.32.59/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/parisc/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c
+--- linux-2.6.32.60/arch/parisc/kernel/traps.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
if (err == 0)
return; /* STFU */
@@ -882,9 +882,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/parisc/kernel/traps.c linux-2.6.32.59
/* Wot's wrong wif bein' racy? */
if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-2.6.32.59/arch/parisc/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/mm/fault.c
---- linux-2.6.32.59/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/parisc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/parisc/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/mm/fault.c
+--- linux-2.6.32.60/arch/parisc/mm/fault.c 2009-09-10 15:25:40.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/parisc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -237,8 +237,9 @@ bad_area:
#ifdef PRINT_USER_FAULTS
@@ -907,9 +907,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/parisc/mm/fault.c linux-2.6.32.59-vs2
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/Kconfig
---- linux-2.6.32.59/arch/powerpc/Kconfig 2009-12-03 20:02:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/Kconfig
+--- linux-2.6.32.60/arch/powerpc/Kconfig 2009-12-03 20:02:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -943,6 +943,8 @@ source "lib/Kconfig"
source "arch/powerpc/Kconfig.debug"
@@ -919,9 +919,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/Kconfig linux-2.6.32.59-vs2.3
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h
---- linux-2.6.32.59/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/include/asm/unistd.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h
+--- linux-2.6.32.60/arch/powerpc/include/asm/unistd.h 2009-12-03 20:02:01.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -931,9 +931,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/include/asm/unistd.h linux-2.
#define __NR_migrate_pages 258
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/process.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c
---- linux-2.6.32.59/arch/powerpc/kernel/process.c 2012-03-20 11:26:03.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/kernel/process.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c
+--- linux-2.6.32.60/arch/powerpc/kernel/process.c 2012-10-20 11:49:40.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/process.c 2011-06-10 13:03:02.000000000 +0200
@@ -519,8 +519,9 @@ void show_regs(struct pt_regs * regs)
#else
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
@@ -946,9 +946,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/process.c linux-2.6.32
#ifdef CONFIG_SMP
printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/traps.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c
---- linux-2.6.32.59/arch/powerpc/kernel/traps.c 2009-09-10 15:25:41.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/kernel/traps.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c
+--- linux-2.6.32.60/arch/powerpc/kernel/traps.c 2009-09-10 15:25:41.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/traps.c 2011-06-10 13:03:02.000000000 +0200
@@ -931,8 +931,9 @@ void nonrecoverable_exception(struct pt_
void trace_syscall(struct pt_regs *regs)
@@ -961,9 +961,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/traps.c linux-2.6.32.5
regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
}
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/vdso.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.59/arch/powerpc/kernel/vdso.c 2009-12-03 20:02:02.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/kernel/vdso.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.60/arch/powerpc/kernel/vdso.c 2009-12-03 20:02:02.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/kernel/vdso.c 2011-06-10 13:03:02.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -972,9 +972,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/kernel/vdso.c linux-2.6.32.59
#include <asm/pgtable.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c
---- linux-2.6.32.59/arch/powerpc/mm/fault.c 2009-12-03 20:02:02.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/powerpc/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c
+--- linux-2.6.32.60/arch/powerpc/mm/fault.c 2009-12-03 20:02:02.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/powerpc/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -358,7 +358,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -985,9 +985,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/powerpc/mm/fault.c linux-2.6.32.59-vs
if (user_mode(regs))
do_group_exit(SIGKILL);
return SIGKILL;
-diff -NurpP --minimal linux-2.6.32.59/arch/s390/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/Kconfig
---- linux-2.6.32.59/arch/s390/Kconfig 2012-03-20 11:26:03.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/Kconfig 2012-03-23 18:34:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/Kconfig
+--- linux-2.6.32.60/arch/s390/Kconfig 2012-10-20 11:49:41.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/Kconfig 2012-03-23 18:34:19.000000000 +0100
@@ -619,6 +619,8 @@ source "fs/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -997,9 +997,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/Kconfig linux-2.6.32.59-vs2.3.0.
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h
---- linux-2.6.32.59/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/include/asm/tlb.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h
+--- linux-2.6.32.60/arch/s390/include/asm/tlb.h 2009-09-10 15:25:43.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -23,6 +23,8 @@
#include <linux/mm.h>
@@ -1009,9 +1009,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/tlb.h linux-2.6.32.5
#include <asm/processor.h>
#include <asm/pgalloc.h>
#include <asm/smp.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h
---- linux-2.6.32.59/arch/s390/include/asm/unistd.h 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/include/asm/unistd.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h
+--- linux-2.6.32.60/arch/s390/include/asm/unistd.h 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
@@ -202,7 +202,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -1021,9 +1021,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/include/asm/unistd.h linux-2.6.3
#define __NR_statfs64 265
#define __NR_fstatfs64 266
#define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/ptrace.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c
---- linux-2.6.32.59/arch/s390/kernel/ptrace.c 2012-03-20 11:26:04.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c 2012-03-23 18:34:49.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/kernel/ptrace.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c
+--- linux-2.6.32.60/arch/s390/kernel/ptrace.c 2012-10-20 11:49:41.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/kernel/ptrace.c 2012-03-23 18:34:49.000000000 +0100
@@ -37,6 +37,7 @@
#include <linux/tracehook.h>
#include <linux/seccomp.h>
@@ -1032,9 +1032,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/ptrace.c linux-2.6.32.59-
#include <trace/syscall.h>
#include <asm/segment.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/syscalls.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S
---- linux-2.6.32.59/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/kernel/syscalls.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S
+--- linux-2.6.32.60/arch/s390/kernel/syscalls.S 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/kernel/syscalls.S 2011-06-10 13:03:02.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)
@@ -1044,9 +1044,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/kernel/syscalls.S linux-2.6.32.5
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-2.6.32.59/arch/s390/lib/uaccess_pt.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c
---- linux-2.6.32.59/arch/s390/lib/uaccess_pt.c 2009-09-10 15:25:43.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/s390/lib/uaccess_pt.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c
+--- linux-2.6.32.60/arch/s390/lib/uaccess_pt.c 2009-09-10 15:25:43.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/s390/lib/uaccess_pt.c 2011-06-10 13:03:02.000000000 +0200
@@ -90,7 +90,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1057,9 +1057,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/s390/lib/uaccess_pt.c linux-2.6.32.59
return ret;
out_sigbus:
-diff -NurpP --minimal linux-2.6.32.59/arch/sh/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/Kconfig
---- linux-2.6.32.59/arch/sh/Kconfig 2009-12-03 20:02:03.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sh/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/Kconfig
+--- linux-2.6.32.60/arch/sh/Kconfig 2009-12-03 20:02:03.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -853,6 +853,8 @@ source "fs/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1069,9 +1069,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sh/Kconfig linux-2.6.32.59-vs2.3.0.36
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/irq.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/irq.c
---- linux-2.6.32.59/arch/sh/kernel/irq.c 2009-12-03 20:02:10.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/irq.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sh/kernel/irq.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/kernel/irq.c
+--- linux-2.6.32.60/arch/sh/kernel/irq.c 2009-12-03 20:02:10.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/kernel/irq.c 2011-06-10 13:03:02.000000000 +0200
@@ -12,6 +12,7 @@
#include <linux/kernel_stat.h>
#include <linux/seq_file.h>
@@ -1080,9 +1080,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/irq.c linux-2.6.32.59-vs2.3
#include <asm/processor.h>
#include <asm/machvec.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-2.6.32.59/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sh/kernel/vsyscall/vsyscall.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-2.6.32.60/arch/sh/kernel/vsyscall/vsyscall.c 2009-03-24 14:18:42.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/kernel/vsyscall/vsyscall.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/elf.h>
#include <linux/sched.h>
@@ -1091,9 +1091,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sh/kernel/vsyscall/vsyscall.c linux-2
/*
* Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/fault_32.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c
---- linux-2.6.32.59/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sh/mm/fault_32.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c
+--- linux-2.6.32.60/arch/sh/mm/fault_32.c 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/mm/fault_32.c 2011-06-10 13:03:02.000000000 +0200
@@ -292,7 +292,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1104,9 +1104,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/fault_32.c linux-2.6.32.59-vs2.
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/tlbflush_64.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c
---- linux-2.6.32.59/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sh/mm/tlbflush_64.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c
+--- linux-2.6.32.60/arch/sh/mm/tlbflush_64.c 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sh/mm/tlbflush_64.c 2011-06-10 13:03:02.000000000 +0200
@@ -306,7 +306,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1117,9 +1117,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sh/mm/tlbflush_64.c linux-2.6.32.59-v
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
-diff -NurpP --minimal linux-2.6.32.59/arch/sparc/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/Kconfig
---- linux-2.6.32.59/arch/sparc/Kconfig 2009-12-03 20:02:14.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sparc/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/Kconfig
+--- linux-2.6.32.60/arch/sparc/Kconfig 2009-12-03 20:02:14.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -550,6 +550,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -1129,9 +1129,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sparc/Kconfig linux-2.6.32.59-vs2.3.0
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/tlb_64.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h
---- linux-2.6.32.59/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sparc/include/asm/tlb_64.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h
+--- linux-2.6.32.60/arch/sparc/include/asm/tlb_64.h 2009-09-10 15:25:45.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/include/asm/tlb_64.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/swap.h>
@@ -1140,9 +1140,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/tlb_64.h linux-2.6.
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/unistd.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h
---- linux-2.6.32.59/arch/sparc/include/asm/unistd.h 2009-12-03 20:02:15.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sparc/include/asm/unistd.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h
+--- linux-2.6.32.60/arch/sparc/include/asm/unistd.h 2009-12-03 20:02:15.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/include/asm/unistd.h 2011-06-10 13:03:02.000000000 +0200
@@ -335,7 +335,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -1152,9 +1152,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sparc/include/asm/unistd.h linux-2.6.
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.32.59/arch/sparc/kernel/systbls_32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S
---- linux-2.6.32.59/arch/sparc/kernel/systbls_32.S 2012-03-20 11:26:05.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sparc/kernel/systbls_32.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S
+--- linux-2.6.32.60/arch/sparc/kernel/systbls_32.S 2012-10-20 11:49:41.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_32.S 2011-06-10 13:03:02.000000000 +0200
@@ -70,7 +70,7 @@ sys_call_table:
/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
/*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -1164,9 +1164,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sparc/kernel/systbls_32.S linux-2.6.3
/*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-2.6.32.59/arch/sparc/kernel/systbls_64.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S
---- linux-2.6.32.59/arch/sparc/kernel/systbls_64.S 2012-03-20 11:26:05.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/sparc/kernel/systbls_64.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S
+--- linux-2.6.32.60/arch/sparc/kernel/systbls_64.S 2012-10-20 11:49:41.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/sparc/kernel/systbls_64.S 2011-06-10 13:03:02.000000000 +0200
@@ -71,7 +71,7 @@ sys_call_table32:
/*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
.word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -1185,9 +1185,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/sparc/kernel/systbls_64.S linux-2.6.3
/*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-2.6.32.59/arch/um/Kconfig.rest linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/Kconfig.rest
---- linux-2.6.32.59/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/Kconfig.rest 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/um/Kconfig.rest linux-2.6.32.60-vs2.3.0.36.29.9/arch/um/Kconfig.rest
+--- linux-2.6.32.60/arch/um/Kconfig.rest 2009-06-11 17:12:19.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/um/Kconfig.rest 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1197,9 +1197,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/um/Kconfig.rest linux-2.6.32.59-vs2.3
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/um/include/asm/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h
---- linux-2.6.32.59/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/um/include/asm/tlb.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h
+--- linux-2.6.32.60/arch/um/include/asm/tlb.h 2009-09-10 15:25:46.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/um/include/asm/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/pagemap.h>
@@ -1208,10 +1208,10 @@ diff -NurpP --minimal linux-2.6.32.59/arch/um/include/asm/tlb.h linux-2.6.32.59-
#include <asm/percpu.h>
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.32.59/arch/x86/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/Kconfig
---- linux-2.6.32.59/arch/x86/Kconfig 2012-03-20 11:26:05.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/Kconfig 2011-06-10 13:03:02.000000000 +0200
-@@ -2100,6 +2100,8 @@ source "fs/Kconfig"
+diff -NurpP --minimal linux-2.6.32.60/arch/x86/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/Kconfig
+--- linux-2.6.32.60/arch/x86/Kconfig 2012-10-20 11:49:42.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/Kconfig 2012-10-20 12:09:01.000000000 +0200
+@@ -2109,6 +2109,8 @@ source "fs/Kconfig"
source "arch/x86/Kconfig.debug"
@@ -1220,9 +1220,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/x86/Kconfig linux-2.6.32.59-vs2.3.0.3
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.32.59/arch/x86/ia32/ia32entry.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.59/arch/x86/ia32/ia32entry.S 2012-03-20 11:26:05.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/x86/ia32/ia32entry.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.60/arch/x86/ia32/ia32entry.S 2012-10-20 11:49:42.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/ia32/ia32entry.S 2011-06-10 13:03:02.000000000 +0200
@@ -783,7 +783,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -1232,9 +1232,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/x86/ia32/ia32entry.S linux-2.6.32.59-
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.32.59/arch/x86/include/asm/unistd_64.h linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h
---- linux-2.6.32.59/arch/x86/include/asm/unistd_64.h 2009-12-03 20:02:16.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/x86/include/asm/unistd_64.h linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h
+--- linux-2.6.32.60/arch/x86/include/asm/unistd_64.h 2009-12-03 20:02:16.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/include/asm/unistd_64.h 2011-06-10 13:03:02.000000000 +0200
@@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -1244,9 +1244,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/x86/include/asm/unistd_64.h linux-2.6
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.32.59/arch/x86/kernel/syscall_table_32.S linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.59/arch/x86/kernel/syscall_table_32.S 2012-03-20 11:26:06.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/x86/kernel/syscall_table_32.S linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.60/arch/x86/kernel/syscall_table_32.S 2012-10-20 11:49:43.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/x86/kernel/syscall_table_32.S 2011-06-10 13:03:02.000000000 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -1256,9 +1256,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/x86/kernel/syscall_table_32.S linux-2
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.32.59/arch/xtensa/mm/fault.c linux-2.6.32.59-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c
---- linux-2.6.32.59/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/arch/xtensa/mm/fault.c linux-2.6.32.60-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c
+--- linux-2.6.32.60/arch/xtensa/mm/fault.c 2009-09-10 15:25:48.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/arch/xtensa/mm/fault.c 2011-06-10 13:03:02.000000000 +0200
@@ -151,7 +151,8 @@ out_of_memory:
down_read(&mm->mmap_sem);
goto survive;
@@ -1269,9 +1269,9 @@ diff -NurpP --minimal linux-2.6.32.59/arch/xtensa/mm/fault.c linux-2.6.32.59-vs2
if (user_mode(regs))
do_group_exit(SIGKILL);
bad_page_fault(regs, address, SIGKILL);
-diff -NurpP --minimal linux-2.6.32.59/drivers/block/Kconfig linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Kconfig
---- linux-2.6.32.59/drivers/block/Kconfig 2009-09-10 15:25:49.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Kconfig 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/block/Kconfig linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/Kconfig
+--- linux-2.6.32.60/drivers/block/Kconfig 2009-09-10 15:25:49.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/Kconfig 2011-06-10 13:03:02.000000000 +0200
@@ -271,6 +271,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -1286,9 +1286,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/block/Kconfig linux-2.6.32.59-vs2.
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.32.59/drivers/block/Makefile linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Makefile
---- linux-2.6.32.59/drivers/block/Makefile 2009-09-10 15:25:49.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/Makefile 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/block/Makefile linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/Makefile
+--- linux-2.6.32.60/drivers/block/Makefile 2009-09-10 15:25:49.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/Makefile 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
@@ -1297,9 +1297,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/block/Makefile linux-2.6.32.59-vs2
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
-diff -NurpP --minimal linux-2.6.32.59/drivers/block/loop.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/loop.c
---- linux-2.6.32.59/drivers/block/loop.c 2012-03-20 11:26:08.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/loop.c 2011-08-08 22:40:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/block/loop.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/loop.c
+--- linux-2.6.32.60/drivers/block/loop.c 2012-10-20 11:49:47.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/loop.c 2011-08-08 22:40:36.000000000 +0200
@@ -74,6 +74,7 @@
#include <linux/gfp.h>
#include <linux/kthread.h>
@@ -1353,9 +1353,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/block/loop.c linux-2.6.32.59-vs2.3
mutex_lock(&lo->lo_ctl_mutex);
lo->lo_refcnt++;
mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-2.6.32.59/drivers/block/vroot.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/vroot.c
---- linux-2.6.32.59/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/block/vroot.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/block/vroot.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/vroot.c
+--- linux-2.6.32.60/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/block/vroot.c 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -1638,9 +1638,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/block/vroot.c linux-2.6.32.59-vs2.
+
+#endif
+
-diff -NurpP --minimal linux-2.6.32.59/drivers/char/sysrq.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/sysrq.c
---- linux-2.6.32.59/drivers/char/sysrq.c 2009-12-03 20:02:20.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/sysrq.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/char/sysrq.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/char/sysrq.c
+--- linux-2.6.32.60/drivers/char/sysrq.c 2009-12-03 20:02:20.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/char/sysrq.c 2011-06-10 13:03:02.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/hrtimer.h>
@@ -1692,9 +1692,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/char/sysrq.c linux-2.6.32.59-vs2.3
else
retval = -1;
return retval;
-diff -NurpP --minimal linux-2.6.32.59/drivers/char/tty_io.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/tty_io.c
---- linux-2.6.32.59/drivers/char/tty_io.c 2012-03-20 11:26:08.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/char/tty_io.c 2012-01-10 09:18:12.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/drivers/char/tty_io.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/char/tty_io.c
+--- linux-2.6.32.60/drivers/char/tty_io.c 2012-10-20 11:49:48.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/char/tty_io.c 2012-01-10 09:18:12.000000000 +0100
@@ -107,6 +107,7 @@
#include <linux/kmod.h>
@@ -1721,9 +1721,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/char/tty_io.c linux-2.6.32.59-vs2.
if (pgrp_nr < 0)
return -EINVAL;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.32.59/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.32.59/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-03 20:02:23.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.32.60/drivers/infiniband/hw/ipath/ipath_user_pages.c 2009-12-03 20:02:23.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/mm.h>
#include <linux/device.h>
@@ -1769,9 +1769,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/infiniband/hw/ipath/ipath_user_pag
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm-ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c
---- linux-2.6.32.59/drivers/md/dm-ioctl.c 2012-03-20 11:26:14.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/md/dm-ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c
+--- linux-2.6.32.60/drivers/md/dm-ioctl.c 2012-10-20 11:49:51.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm-ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -16,6 +16,7 @@
#include <linux/dm-ioctl.h>
#include <linux/hdreg.h>
@@ -1853,9 +1853,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm-ioctl.c linux-2.6.32.59-vs2.
return -EACCES;
if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.c
---- linux-2.6.32.59/drivers/md/dm.c 2012-03-20 11:26:15.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.c 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/drivers/md/dm.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm.c
+--- linux-2.6.32.60/drivers/md/dm.c 2012-10-20 11:49:51.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm.c 2011-11-17 12:18:26.000000000 +0100
@@ -19,6 +19,7 @@
#include <linux/slab.h>
#include <linux/idr.h>
@@ -1929,9 +1929,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.c linux-2.6.32.59-vs2.3.0.36
md->queue = blk_init_queue(dm_request_fn, NULL);
if (!md->queue)
goto bad_queue;
-diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.h linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.h
---- linux-2.6.32.59/drivers/md/dm.h 2009-09-10 15:25:55.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/md/dm.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/md/dm.h linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm.h
+--- linux-2.6.32.60/drivers/md/dm.h 2009-09-10 15:25:55.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/md/dm.h 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,8 @@ struct dm_dev_internal {
struct dm_table;
struct dm_md_mempools;
@@ -1941,9 +1941,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/md/dm.h linux-2.6.32.59-vs2.3.0.36
/*-----------------------------------------------------------------
* Internal table functions.
*---------------------------------------------------------------*/
-diff -NurpP --minimal linux-2.6.32.59/drivers/net/tun.c linux-2.6.32.59-vs2.3.0.36.29.9/drivers/net/tun.c
---- linux-2.6.32.59/drivers/net/tun.c 2012-03-20 11:26:17.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/drivers/net/tun.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/drivers/net/tun.c linux-2.6.32.60-vs2.3.0.36.29.9/drivers/net/tun.c
+--- linux-2.6.32.60/drivers/net/tun.c 2012-10-20 11:49:55.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/drivers/net/tun.c 2012-10-20 12:09:03.000000000 +0200
@@ -61,6 +61,7 @@
#include <linux/crc32.h>
#include <linux/nsproxy.h>
@@ -1996,7 +1996,7 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/net/tun.c linux-2.6.32.59-vs2.3.0.
err = tun_attach(tun, file);
if (err < 0)
goto failed;
-@@ -1203,6 +1209,16 @@ static long tun_chr_ioctl(struct file *f
+@@ -1205,6 +1211,16 @@ static long tun_chr_ioctl(struct file *f
DBG(KERN_INFO "%s: group set to %d\n", tun->dev->name, tun->group);
break;
@@ -2013,9 +2013,9 @@ diff -NurpP --minimal linux-2.6.32.59/drivers/net/tun.c linux-2.6.32.59-vs2.3.0.
case TUNSETLINK:
/* Only allow setting the type when the interface is down */
if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-2.6.32.59/fs/attr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/attr.c
---- linux-2.6.32.59/fs/attr.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/attr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/attr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/attr.c
+--- linux-2.6.32.60/fs/attr.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/attr.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2056,9 +2056,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/attr.c linux-2.6.32.59-vs2.3.0.36.29.9/
error = vfs_dq_transfer(inode, attr) ?
-EDQUOT : 0;
if (!error)
-diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_aout.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_aout.c
---- linux-2.6.32.59/fs/binfmt_aout.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_aout.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/binfmt_aout.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_aout.c
+--- linux-2.6.32.60/fs/binfmt_aout.c 2012-10-20 11:50:04.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_aout.c 2011-06-10 13:03:02.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2067,9 +2067,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_aout.c linux-2.6.32.59-vs2.3.0.3
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_elf.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_elf.c
---- linux-2.6.32.59/fs/binfmt_elf.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_elf.c 2012-03-23 18:34:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/binfmt_elf.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_elf.c
+--- linux-2.6.32.60/fs/binfmt_elf.c 2012-10-20 11:50:04.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_elf.c 2012-03-23 18:34:19.000000000 +0100
@@ -31,6 +31,7 @@
#include <linux/random.h>
#include <linux/elf.h>
@@ -2078,9 +2078,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_elf.c linux-2.6.32.59-vs2.3.0.36
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_flat.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_flat.c
---- linux-2.6.32.59/fs/binfmt_flat.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_flat.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/binfmt_flat.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_flat.c
+--- linux-2.6.32.60/fs/binfmt_flat.c 2012-10-20 11:50:04.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_flat.c 2011-06-10 13:03:02.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2089,9 +2089,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_flat.c linux-2.6.32.59-vs2.3.0.3
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_som.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_som.c
---- linux-2.6.32.59/fs/binfmt_som.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/binfmt_som.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/binfmt_som.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_som.c
+--- linux-2.6.32.60/fs/binfmt_som.c 2012-10-20 11:50:04.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/binfmt_som.c 2011-06-10 13:03:02.000000000 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2100,9 +2100,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/binfmt_som.c linux-2.6.32.59-vs2.3.0.36
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/block_dev.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/block_dev.c
---- linux-2.6.32.59/fs/block_dev.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/block_dev.c 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/block_dev.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/block_dev.c
+--- linux-2.6.32.60/fs/block_dev.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/block_dev.c 2011-11-17 12:18:26.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/namei.h>
#include <linux/log2.h>
@@ -2140,9 +2140,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/block_dev.c linux-2.6.32.59-vs2.3.0.36.
if (bdev) {
spin_lock(&bdev_lock);
if (!inode->i_bdev) {
-diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ctree.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ctree.h
---- linux-2.6.32.59/fs/btrfs/ctree.h 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ctree.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/btrfs/ctree.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/ctree.h
+--- linux-2.6.32.60/fs/btrfs/ctree.h 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/ctree.h 2011-06-10 13:03:02.000000000 +0200
@@ -547,11 +547,14 @@ struct btrfs_inode_item {
/* modification sequence number for NFS */
__le64 sequence;
@@ -2195,9 +2195,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ctree.h linux-2.6.32.59-vs2.3.0.3
/* file.c */
int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync);
-diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/disk-io.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/disk-io.c
---- linux-2.6.32.59/fs/btrfs/disk-io.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/disk-io.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/btrfs/disk-io.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/disk-io.c
+--- linux-2.6.32.60/fs/btrfs/disk-io.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/disk-io.c 2011-06-10 13:03:02.000000000 +0200
@@ -1728,6 +1728,9 @@ struct btrfs_root *open_ctree(struct sup
goto fail_iput;
}
@@ -2208,9 +2208,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/disk-io.c linux-2.6.32.59-vs2.3.0
features = btrfs_super_incompat_flags(disk_super) &
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
-diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/inode.c
---- linux-2.6.32.59/fs/btrfs/inode.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/btrfs/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/inode.c
+--- linux-2.6.32.60/fs/btrfs/inode.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,8 @@
#include <linux/xattr.h>
#include <linux/posix_acl.h>
@@ -2287,9 +2287,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/inode.c linux-2.6.32.59-vs2.3.0.3
};
static const struct inode_operations btrfs_special_inode_operations = {
.getattr = btrfs_getattr,
-diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ioctl.c
---- linux-2.6.32.59/fs/btrfs/ioctl.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/btrfs/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/ioctl.c
+--- linux-2.6.32.60/fs/btrfs/ioctl.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -67,10 +67,13 @@ static unsigned int btrfs_flags_to_ioctl
{
unsigned int iflags = 0;
@@ -2471,9 +2471,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/ioctl.c linux-2.6.32.59-vs2.3.0.3
if (flags & FS_APPEND_FL)
ip->flags |= BTRFS_INODE_APPEND;
else
-diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/super.c
---- linux-2.6.32.59/fs/btrfs/super.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/btrfs/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/btrfs/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/super.c
+--- linux-2.6.32.60/fs/btrfs/super.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/btrfs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -67,7 +67,7 @@ enum {
Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier,
Opt_ssd, Opt_nossd, Opt_ssd_spread, Opt_thread_pool, Opt_noacl,
@@ -2529,9 +2529,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/btrfs/super.c linux-2.6.32.59-vs2.3.0.3
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0;
-diff -NurpP --minimal linux-2.6.32.59/fs/char_dev.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/char_dev.c
---- linux-2.6.32.59/fs/char_dev.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/char_dev.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/char_dev.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/char_dev.c
+--- linux-2.6.32.60/fs/char_dev.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/char_dev.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,8 @@
#include <linux/cdev.h>
#include <linux/mutex.h>
@@ -2564,9 +2564,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/char_dev.c linux-2.6.32.59-vs2.3.0.36.2
if (!kobj)
return -ENXIO;
new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-2.6.32.59/fs/dcache.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/dcache.c
---- linux-2.6.32.59/fs/dcache.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/dcache.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/dcache.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/dcache.c
+--- linux-2.6.32.60/fs/dcache.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/dcache.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/bootmem.h>
#include <linux/fs_struct.h>
@@ -2618,9 +2618,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/dcache.c linux-2.6.32.59-vs2.3.0.36.29.
found = dentry;
spin_unlock(&dentry->d_lock);
break;
-diff -NurpP --minimal linux-2.6.32.59/fs/devpts/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/devpts/inode.c
---- linux-2.6.32.59/fs/devpts/inode.c 2012-03-20 11:26:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/devpts/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/devpts/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/devpts/inode.c
+--- linux-2.6.32.60/fs/devpts/inode.c 2012-10-20 11:50:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/devpts/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -24,6 +24,7 @@
#include <linux/parser.h>
#include <linux/fsnotify.h>
@@ -2703,9 +2703,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/devpts/inode.c linux-2.6.32.59-vs2.3.0.
inode->i_private = tty;
tty->driver_data = inode;
-diff -NurpP --minimal linux-2.6.32.59/fs/exec.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/exec.c
---- linux-2.6.32.59/fs/exec.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/exec.c 2011-08-08 22:40:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/exec.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/exec.c
+--- linux-2.6.32.60/fs/exec.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/exec.c 2011-08-08 22:40:36.000000000 +0200
@@ -273,7 +273,9 @@ static int __bprm_mm_init(struct linux_b
if (err)
goto err;
@@ -2726,9 +2726,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/exec.c linux-2.6.32.59-vs2.3.0.36.29.9/
rc = snprintf(out_ptr, out_end - out_ptr,
"%lu", tv.tv_sec);
if (rc > out_end - out_ptr)
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/balloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/balloc.c
---- linux-2.6.32.59/fs/ext2/balloc.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/balloc.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/balloc.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/balloc.c
+--- linux-2.6.32.60/fs/ext2/balloc.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/balloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block
start = 0;
end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -2737,9 +2737,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/balloc.c linux-2.6.32.59-vs2.3.0.3
BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
repeat:
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ext2.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ext2.h
---- linux-2.6.32.59/fs/ext2/ext2.h 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ext2.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/ext2.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ext2.h
+--- linux-2.6.32.60/fs/ext2/ext2.h 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ext2.h 2011-06-10 13:03:02.000000000 +0200
@@ -131,6 +131,7 @@ extern int ext2_fiemap(struct inode *ino
int __ext2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
@@ -2748,18 +2748,18 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ext2.h linux-2.6.32.59-vs2.3.0.36.
/* ioctl.c */
extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/file.c
---- linux-2.6.32.59/fs/ext2/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/file.c
+--- linux-2.6.32.60/fs/ext2/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -87,4 +87,5 @@ const struct inode_operations ext2_file_
.setattr = ext2_setattr,
.check_acl = ext2_check_acl,
.fiemap = ext2_fiemap,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ialloc.c
---- linux-2.6.32.59/fs/ext2/ialloc.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ialloc.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/ialloc.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ialloc.c
+--- linux-2.6.32.60/fs/ext2/ialloc.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2776,9 +2776,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ialloc.c linux-2.6.32.59-vs2.3.0.3
inode->i_ino = ino;
inode->i_blocks = 0;
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/inode.c
---- linux-2.6.32.59/fs/ext2/inode.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/inode.c 2011-06-10 18:47:35.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/inode.c
+--- linux-2.6.32.60/fs/ext2/inode.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/inode.c 2011-06-10 18:47:35.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/mpage.h>
#include <linux/fiemap.h>
@@ -2927,9 +2927,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/inode.c linux-2.6.32.59-vs2.3.0.36
error = vfs_dq_transfer(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ioctl.c
---- linux-2.6.32.59/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/ioctl.c 2011-06-10 18:47:17.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ioctl.c
+--- linux-2.6.32.60/fs/ext2/ioctl.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/ioctl.c 2011-06-10 18:47:17.000000000 +0200
@@ -17,6 +17,16 @@
#include <asm/uaccess.h>
@@ -2979,9 +2979,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/ioctl.c linux-2.6.32.59-vs2.3.0.36
flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
ei->i_flags = flags;
mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/namei.c
---- linux-2.6.32.59/fs/ext2/namei.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/namei.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/namei.c
+--- linux-2.6.32.60/fs/ext2/namei.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -31,6 +31,7 @@
*/
@@ -3006,9 +3006,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/namei.c linux-2.6.32.59-vs2.3.0.36
};
const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.59/fs/ext2/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/super.c
---- linux-2.6.32.59/fs/ext2/super.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext2/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext2/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/super.c
+--- linux-2.6.32.60/fs/ext2/super.c 2009-09-10 15:26:21.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext2/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -382,7 +382,8 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -3074,9 +3074,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext2/super.c linux-2.6.32.59-vs2.3.0.36
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/file.c
---- linux-2.6.32.59/fs/ext3/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/file.c
+--- linux-2.6.32.60/fs/ext3/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -80,5 +80,6 @@ const struct inode_operations ext3_file_
#endif
.check_acl = ext3_check_acl,
@@ -3084,9 +3084,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/file.c linux-2.6.32.59-vs2.3.0.36.
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ialloc.c
---- linux-2.6.32.59/fs/ext3/ialloc.c 2009-09-10 15:26:21.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ialloc.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/ialloc.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/ialloc.c
+--- linux-2.6.32.60/fs/ext3/ialloc.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/ialloc.c 2012-10-20 12:09:07.000000000 +0200
@@ -23,6 +23,7 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -3103,9 +3103,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ialloc.c linux-2.6.32.59-vs2.3.0.3
inode->i_ino = ino;
/* This is the optimal IO size (for stat), not the fs block size */
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/inode.c
---- linux-2.6.32.59/fs/ext3/inode.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/inode.c
+--- linux-2.6.32.60/fs/ext3/inode.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/inode.c 2012-10-20 12:09:07.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/bio.h>
#include <linux/fiemap.h>
@@ -3229,9 +3229,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36
+ uid_t uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag);
+ gid_t gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag);
int err = 0, rc, block;
-
- again:
-@@ -2961,29 +2995,32 @@ again:
+ int need_datasync = 0;
+ __le32 disksize;
+@@ -2963,29 +2997,32 @@ again:
ext3_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if(!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3268,9 +3268,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36
+ raw_inode->i_raw_tag = cpu_to_le16(inode->i_tag);
+#endif
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
- raw_inode->i_size = cpu_to_le32(ei->i_disksize);
- raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
-@@ -3141,7 +3178,8 @@ int ext3_setattr(struct dentry *dentry,
+ disksize = cpu_to_le32(ei->i_disksize);
+ if (disksize != raw_inode->i_size) {
+@@ -3152,7 +3189,8 @@ int ext3_setattr(struct dentry *dentry,
return error;
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -3280,7 +3280,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -3163,6 +3201,8 @@ int ext3_setattr(struct dentry *dentry,
+@@ -3174,6 +3212,8 @@ int ext3_setattr(struct dentry *dentry,
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
@@ -3289,9 +3289,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/inode.c linux-2.6.32.59-vs2.3.0.36
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ioctl.c
---- linux-2.6.32.59/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/ioctl.c
+--- linux-2.6.32.60/fs/ext3/ioctl.c 2009-06-11 17:13:03.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,7 @@
*/
@@ -3367,9 +3367,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/ioctl.c linux-2.6.32.59-vs2.3.0.36
flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
ei->i_flags = flags;
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/namei.c
---- linux-2.6.32.59/fs/ext3/namei.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/namei.c 2011-08-08 22:40:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/namei.c
+--- linux-2.6.32.60/fs/ext3/namei.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/namei.c 2011-08-08 22:40:36.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3394,9 +3394,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/namei.c linux-2.6.32.59-vs2.3.0.36
};
const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.59/fs/ext3/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/super.c
---- linux-2.6.32.59/fs/ext3/super.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext3/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext3/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/super.c
+--- linux-2.6.32.60/fs/ext3/super.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext3/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -789,7 +789,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
@@ -3462,9 +3462,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext3/super.c linux-2.6.32.59-vs2.3.0.36
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT3_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ext4.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ext4.h
---- linux-2.6.32.59/fs/ext4/ext4.h 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ext4.h 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/ext4.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ext4.h
+--- linux-2.6.32.60/fs/ext4/ext4.h 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ext4.h 2011-11-17 12:18:26.000000000 +0100
@@ -289,8 +289,12 @@ struct flex_groups {
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */
@@ -3512,9 +3512,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ext4.h linux-2.6.32.59-vs2.3.0.36.
/* 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-2.6.32.59/fs/ext4/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/file.c
---- linux-2.6.32.59/fs/ext4/file.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/file.c
+--- linux-2.6.32.60/fs/ext4/file.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -161,5 +161,6 @@ const struct inode_operations ext4_file_
.check_acl = ext4_check_acl,
.fallocate = ext4_fallocate,
@@ -3522,9 +3522,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/file.c linux-2.6.32.59-vs2.3.0.36.
+ .sync_flags = ext4_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ialloc.c
---- linux-2.6.32.59/fs/ext4/ialloc.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ialloc.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/ialloc.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ialloc.c
+--- linux-2.6.32.60/fs/ext4/ialloc.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ialloc.c 2012-10-20 12:09:07.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/random.h>
#include <linux/bitops.h>
@@ -3541,9 +3541,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ialloc.c linux-2.6.32.59-vs2.3.0.3
inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);
/* This is the optimal IO size (for stat), not the fs block size */
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/inode.c
---- linux-2.6.32.59/fs/ext4/inode.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/inode.c 2012-01-10 09:18:12.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/inode.c
+--- linux-2.6.32.60/fs/ext4/inode.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/inode.c 2012-10-20 12:09:08.000000000 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/bio.h>
@@ -3552,7 +3552,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
#include "ext4_jbd2.h"
#include "xattr.h"
-@@ -4446,7 +4447,7 @@ static void ext4_free_branches(handle_t
+@@ -4455,7 +4456,7 @@ static void ext4_free_branches(handle_t
int ext4_can_truncate(struct inode *inode)
{
@@ -3561,7 +3561,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
return 0;
if (S_ISREG(inode->i_mode))
return 1;
-@@ -4799,41 +4800,64 @@ void ext4_set_inode_flags(struct inode *
+@@ -4808,41 +4809,64 @@ void ext4_set_inode_flags(struct inode *
{
unsigned int flags = EXT4_I(inode)->i_flags;
@@ -3635,7 +3635,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
} while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl);
}
-@@ -4869,6 +4893,8 @@ struct inode *ext4_iget(struct super_blo
+@@ -4878,6 +4902,8 @@ struct inode *ext4_iget(struct super_blo
journal_t *journal = EXT4_SB(sb)->s_journal;
long ret;
int block;
@@ -3644,7 +3644,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
inode = iget_locked(sb, ino);
if (!inode)
-@@ -4884,12 +4910,16 @@ struct inode *ext4_iget(struct super_blo
+@@ -4893,12 +4919,16 @@ struct inode *ext4_iget(struct super_blo
goto bad_inode;
raw_inode = ext4_raw_inode(&iloc);
inode->i_mode = le16_to_cpu(raw_inode->i_mode);
@@ -3665,7 +3665,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
ei->i_state_flags = 0;
-@@ -5111,6 +5141,8 @@ static int ext4_do_update_inode(handle_t
+@@ -5120,6 +5150,8 @@ static int ext4_do_update_inode(handle_t
struct ext4_inode *raw_inode = ext4_raw_inode(iloc);
struct ext4_inode_info *ei = EXT4_I(inode);
struct buffer_head *bh = iloc->bh;
@@ -3674,7 +3674,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
int err = 0, rc, block;
/* For fields not not tracking in the in-memory inode,
-@@ -5121,29 +5153,32 @@ static int ext4_do_update_inode(handle_t
+@@ -5130,29 +5162,32 @@ static int ext4_do_update_inode(handle_t
ext4_get_inode_flags(ei);
raw_inode->i_mode = cpu_to_le16(inode->i_mode);
if (!(test_opt(inode->i_sb, NO_UID32))) {
@@ -3713,7 +3713,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode);
-@@ -5329,7 +5364,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5338,7 +5373,8 @@ int ext4_setattr(struct dentry *dentry,
return error;
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
@@ -3723,7 +3723,7 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
handle_t *handle;
/* (user+group)*(old+new) structure, inode write (sb,
-@@ -5351,6 +5387,8 @@ int ext4_setattr(struct dentry *dentry,
+@@ -5360,6 +5396,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;
@@ -3732,9 +3732,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/inode.c linux-2.6.32.59-vs2.3.0.36
error = ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ioctl.c
---- linux-2.6.32.59/fs/ext4/ioctl.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ioctl.c
+--- linux-2.6.32.60/fs/ext4/ioctl.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -14,10 +14,39 @@
#include <linux/compat.h>
#include <linux/mount.h>
@@ -3798,9 +3798,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/ioctl.c linux-2.6.32.59-vs2.3.0.36
if (!capable(CAP_LINUX_IMMUTABLE))
goto flags_out;
}
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/namei.c
---- linux-2.6.32.59/fs/ext4/namei.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/namei.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/namei.c
+--- linux-2.6.32.60/fs/ext4/namei.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,6 +34,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3825,9 +3825,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/namei.c linux-2.6.32.59-vs2.3.0.36
};
const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-2.6.32.59/fs/ext4/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/super.c
---- linux-2.6.32.59/fs/ext4/super.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ext4/super.c 2012-02-09 10:33:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/ext4/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/super.c
+--- linux-2.6.32.60/fs/ext4/super.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ext4/super.c 2012-02-09 10:33:19.000000000 +0100
@@ -1100,6 +1100,7 @@ enum {
Opt_block_validity, Opt_noblock_validity,
Opt_inode_readahead_blks, Opt_journal_ioprio,
@@ -3892,9 +3892,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ext4/super.c linux-2.6.32.59-vs2.3.0.36
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT4_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
-diff -NurpP --minimal linux-2.6.32.59/fs/fcntl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/fcntl.c
---- linux-2.6.32.59/fs/fcntl.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/fcntl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/fcntl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/fcntl.c
+--- linux-2.6.32.60/fs/fcntl.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/fcntl.c 2011-06-10 13:03:02.000000000 +0200
@@ -19,6 +19,7 @@
#include <linux/signal.h>
#include <linux/rcupdate.h>
@@ -3921,9 +3921,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/fcntl.c linux-2.6.32.59-vs2.3.0.36.29.9
err = security_file_fcntl(filp, cmd, arg);
if (err) {
-diff -NurpP --minimal linux-2.6.32.59/fs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/file.c
---- linux-2.6.32.59/fs/file.c 2009-12-03 20:02:51.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/file.c
+--- linux-2.6.32.60/fs/file.c 2009-12-03 20:02:51.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/spinlock.h>
#include <linux/rcupdate.h>
@@ -3949,9 +3949,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/
#if 1
/* Sanity check */
if (rcu_dereference(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-2.6.32.59/fs/file_table.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/file_table.c
---- linux-2.6.32.59/fs/file_table.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/file_table.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/file_table.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/file_table.c
+--- linux-2.6.32.60/fs/file_table.c 2012-10-20 11:50:06.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/file_table.c 2011-06-10 13:03:02.000000000 +0200
@@ -22,6 +22,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
@@ -3988,9 +3988,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/file_table.c linux-2.6.32.59-vs2.3.0.36
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.32.59/fs/fs_struct.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/fs_struct.c
---- linux-2.6.32.59/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/fs_struct.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/fs_struct.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/fs_struct.c
+--- linux-2.6.32.60/fs/fs_struct.c 2009-06-11 17:13:04.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/fs_struct.c 2011-06-10 13:03:02.000000000 +0200
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -4015,9 +4015,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/fs_struct.c linux-2.6.32.59-vs2.3.0.36.
}
return fs;
}
-diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/file.c
---- linux-2.6.32.59/fs/gfs2/file.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/gfs2/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/file.c
+--- linux-2.6.32.60/fs/gfs2/file.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -132,6 +132,9 @@ static const u32 fsflags_to_gfs2[32] = {
[7] = GFS2_DIF_NOATIME,
[12] = GFS2_DIF_EXHASH,
@@ -4138,9 +4138,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/file.c linux-2.6.32.59-vs2.3.0.36.
static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
switch(cmd) {
-diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/inode.h
---- linux-2.6.32.59/fs/gfs2/inode.h 2009-09-10 15:26:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/gfs2/inode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/inode.h
+--- linux-2.6.32.60/fs/gfs2/inode.h 2009-09-10 15:26:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -109,6 +109,7 @@ extern const struct file_operations gfs2
extern const struct file_operations gfs2_dir_fops_nolock;
@@ -4149,9 +4149,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/inode.h linux-2.6.32.59-vs2.3.0.36
#ifdef CONFIG_GFS2_FS_LOCKING_DLM
extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/ops_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c
---- linux-2.6.32.59/fs/gfs2/ops_inode.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/gfs2/ops_inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c
+--- linux-2.6.32.60/fs/gfs2/ops_inode.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/gfs2/ops_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -1400,6 +1400,7 @@ const struct inode_operations gfs2_file_
.listxattr = gfs2_listxattr,
.removexattr = gfs2_removexattr,
@@ -4168,9 +4168,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/gfs2/ops_inode.c linux-2.6.32.59-vs2.3.
};
const struct inode_operations gfs2_symlink_iops = {
-diff -NurpP --minimal linux-2.6.32.59/fs/hfsplus/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c
---- linux-2.6.32.59/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/hfsplus/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c
+--- linux-2.6.32.60/fs/hfsplus/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/hfsplus/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/mount.h>
#include <linux/sched.h>
@@ -4179,9 +4179,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/hfsplus/ioctl.c linux-2.6.32.59-vs2.3.0
#include <asm/uaccess.h>
#include "hfsplus_fs.h"
-diff -NurpP --minimal linux-2.6.32.59/fs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/inode.c
---- linux-2.6.32.59/fs/inode.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/inode.c 2011-08-08 22:40:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/inode.c
+--- linux-2.6.32.60/fs/inode.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/inode.c 2011-08-08 22:40:36.000000000 +0200
@@ -133,6 +133,9 @@ int inode_init_always(struct super_block
struct address_space *const mapping = &inode->i_data;
@@ -4221,9 +4221,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9
} else if (S_ISFIFO(mode))
inode->i_fop = &def_fifo_fops;
else if (S_ISSOCK(mode))
-diff -NurpP --minimal linux-2.6.32.59/fs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioctl.c
---- linux-2.6.32.59/fs/ioctl.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ioctl.c
+--- linux-2.6.32.60/fs/ioctl.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -16,6 +16,9 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -4234,9 +4234,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9
#include <asm/ioctls.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/ioprio.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioprio.c
---- linux-2.6.32.59/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ioprio.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ioprio.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ioprio.c
+--- linux-2.6.32.60/fs/ioprio.c 2009-03-24 14:22:26.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ioprio.c 2011-06-10 13:03:02.000000000 +0200
@@ -26,6 +26,7 @@
#include <linux/syscalls.h>
#include <linux/security.h>
@@ -4263,9 +4263,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ioprio.c linux-2.6.32.59-vs2.3.0.36.29.
tmpio = get_task_ioprio(p);
if (tmpio < 0)
continue;
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/acl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/acl.c
---- linux-2.6.32.59/fs/jfs/acl.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/acl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/acl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/acl.c
+--- linux-2.6.32.60/fs/jfs/acl.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/acl.c 2011-06-10 13:03:02.000000000 +0200
@@ -216,7 +216,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -4276,9 +4276,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/acl.c linux-2.6.32.59-vs2.3.0.36.29
if (vfs_dq_transfer(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/file.c
---- linux-2.6.32.59/fs/jfs/file.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/file.c
+--- linux-2.6.32.60/fs/jfs/file.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -98,6 +98,7 @@ const struct inode_operations jfs_file_i
.setattr = jfs_setattr,
.check_acl = jfs_check_acl,
@@ -4287,9 +4287,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/file.c linux-2.6.32.59-vs2.3.0.36.2
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/ioctl.c
---- linux-2.6.32.59/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/ioctl.c
+--- linux-2.6.32.60/fs/jfs/ioctl.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -11,6 +11,7 @@
#include <linux/mount.h>
#include <linux/time.h>
@@ -4347,9 +4347,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.
flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
jfs_inode->mode2 = flags;
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_dinode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h
---- linux-2.6.32.59/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/jfs_dinode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h
+--- linux-2.6.32.60/fs/jfs/jfs_dinode.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
@@ -161,9 +161,13 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
@@ -4366,9 +4366,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_dinode.h linux-2.6.32.59-vs2.3.
#define JFS_FL_INHERIT 0x03C80000
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_filsys.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h
---- linux-2.6.32.59/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/jfs_filsys.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h
+--- linux-2.6.32.60/fs/jfs/jfs_filsys.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_filsys.h 2011-06-10 13:03:02.000000000 +0200
@@ -263,6 +263,7 @@
#define JFS_NAME_MAX 255
#define JFS_PATH_MAX BPSIZE
@@ -4377,9 +4377,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_filsys.h linux-2.6.32.59-vs2.3.
/*
* file system state (superblock state)
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_imap.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c
---- linux-2.6.32.59/fs/jfs/jfs_imap.c 2009-09-10 15:26:22.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/jfs_imap.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c
+--- linux-2.6.32.60/fs/jfs/jfs_imap.c 2009-09-10 15:26:22.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_imap.c 2011-06-10 13:03:02.000000000 +0200
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4439,9 +4439,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_imap.c linux-2.6.32.59-vs2.3.0.
jfs_get_inode_flags(jfs_ip);
/*
* mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c
---- linux-2.6.32.59/fs/jfs/jfs_inode.c 2009-06-11 17:13:05.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/jfs_inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c
+--- linux-2.6.32.60/fs/jfs/jfs_inode.c 2009-06-11 17:13:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4523,9 +4523,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.c linux-2.6.32.59-vs2.3.0
/*
* New inodes need to save sane values on disk when
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h
---- linux-2.6.32.59/fs/jfs/jfs_inode.h 2009-06-11 17:13:05.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/jfs_inode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h
+--- linux-2.6.32.60/fs/jfs/jfs_inode.h 2009-06-11 17:13:05.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/jfs_inode.h 2011-06-10 13:03:02.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);
@@ -4534,9 +4534,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/jfs_inode.h linux-2.6.32.59-vs2.3.0
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
extern const struct address_space_operations jfs_aops;
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/namei.c
---- linux-2.6.32.59/fs/jfs/namei.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/namei.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/namei.c
+--- linux-2.6.32.60/fs/jfs/namei.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/ctype.h>
#include <linux/quotaops.h>
@@ -4561,9 +4561,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/namei.c linux-2.6.32.59-vs2.3.0.36.
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.32.59/fs/jfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/super.c
---- linux-2.6.32.59/fs/jfs/super.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/jfs/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/jfs/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/super.c
+--- linux-2.6.32.60/fs/jfs/super.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/jfs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -192,7 +192,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4629,9 +4629,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/jfs/super.c linux-2.6.32.59-vs2.3.0.36.
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.32.59/fs/libfs.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/libfs.c
---- linux-2.6.32.59/fs/libfs.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/libfs.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/libfs.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/libfs.c
+--- linux-2.6.32.60/fs/libfs.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/libfs.c 2011-06-10 13:03:02.000000000 +0200
@@ -127,7 +127,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4678,9 +4678,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/libfs.c linux-2.6.32.59-vs2.3.0.36.29.9
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-2.6.32.59/fs/locks.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/locks.c
---- linux-2.6.32.59/fs/locks.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/locks.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/locks.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/locks.c
+--- linux-2.6.32.60/fs/locks.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/locks.c 2012-10-20 12:09:09.000000000 +0200
@@ -127,6 +127,8 @@
#include <linux/time.h>
#include <linux/rcupdate.h>
@@ -4866,9 +4866,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/locks.c linux-2.6.32.59-vs2.3.0.36.29.9
f->private++;
return 0;
-diff -NurpP --minimal linux-2.6.32.59/fs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/namei.c
---- linux-2.6.32.59/fs/namei.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/namei.c 2011-06-10 18:44:08.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/namei.c
+--- linux-2.6.32.60/fs/namei.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/namei.c 2011-06-10 18:44:08.000000000 +0200
@@ -33,6 +33,14 @@
#include <linux/fcntl.h>
#include <linux/device_cgroup.h>
@@ -5340,9 +5340,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9
/* get the link contents into pagecache */
static char *page_getlink(struct dentry * dentry, struct page **ppage)
{
-diff -NurpP --minimal linux-2.6.32.59/fs/namespace.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/namespace.c
---- linux-2.6.32.59/fs/namespace.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/namespace.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/namespace.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/namespace.c
+--- linux-2.6.32.60/fs/namespace.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/namespace.c 2011-06-10 13:03:02.000000000 +0200
@@ -29,6 +29,11 @@
#include <linux/log2.h>
#include <linux/idr.h>
@@ -5633,9 +5633,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/namespace.c linux-2.6.32.59-vs2.3.0.36.
kfree(ns);
}
EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/client.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/client.c
---- linux-2.6.32.59/fs/nfs/client.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/client.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/client.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/client.c
+--- linux-2.6.32.60/fs/nfs/client.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/client.c 2011-06-10 13:03:02.000000000 +0200
@@ -738,6 +738,9 @@ static int nfs_init_server_rpcclient(str
if (server->flags & NFS_MOUNT_SOFT)
server->client->cl_softrtry = 1;
@@ -5657,9 +5657,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/client.c linux-2.6.32.59-vs2.3.0.36
server->maxfilesize = fsinfo->maxfilesize;
/* We're airborne Set socket buffersize */
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/dir.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/dir.c
---- linux-2.6.32.59/fs/nfs/dir.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/dir.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/dir.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/dir.c
+--- linux-2.6.32.60/fs/nfs/dir.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/dir.c 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#include <linux/namei.h>
#include <linux/mount.h>
@@ -5676,9 +5676,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/dir.c linux-2.6.32.59-vs2.3.0.36.29
no_entry:
res = d_materialise_unique(dentry, inode);
if (res != NULL) {
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/inode.c
---- linux-2.6.32.59/fs/nfs/inode.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/inode.c 2011-09-30 02:12:21.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/inode.c
+--- linux-2.6.32.60/fs/nfs/inode.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/inode.c 2011-09-30 02:12:21.000000000 +0200
@@ -36,6 +36,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -5863,9 +5863,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/inode.c linux-2.6.32.59-vs2.3.0.36.
if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
if (inode->i_nlink != fattr->nlink) {
invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfs3xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c
---- linux-2.6.32.59/fs/nfs/nfs3xdr.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/nfs3xdr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c
+--- linux-2.6.32.60/fs/nfs/nfs3xdr.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5955,9 +5955,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfs3xdr.c linux-2.6.32.59-vs2.3.0.3
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfsroot.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfsroot.c
---- linux-2.6.32.59/fs/nfs/nfsroot.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/nfsroot.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/nfsroot.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/nfsroot.c
+--- linux-2.6.32.60/fs/nfs/nfsroot.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/nfsroot.c 2011-06-10 13:03:02.000000000 +0200
@@ -122,12 +122,12 @@ static int mount_port __initdata = 0; /
enum {
/* Options that take integer arguments */
@@ -6004,9 +6004,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/nfsroot.c linux-2.6.32.59-vs2.3.0.3
default:
printk(KERN_WARNING "Root-NFS: unknown "
"option: %s\n", p);
-diff -NurpP --minimal linux-2.6.32.59/fs/nfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/super.c
---- linux-2.6.32.59/fs/nfs/super.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfs/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfs/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/super.c
+--- linux-2.6.32.60/fs/nfs/super.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfs/super.c 2012-10-20 12:09:09.000000000 +0200
@@ -53,6 +53,7 @@
#include <linux/nfs_xdr.h>
#include <linux/magic.h>
@@ -6023,9 +6023,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfs/super.c linux-2.6.32.59-vs2.3.0.36.
{ 0, NULL, NULL }
};
const struct proc_nfs_info *nfs_infop;
-diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/auth.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/auth.c
---- linux-2.6.32.59/fs/nfsd/auth.c 2009-12-03 20:02:52.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/auth.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfsd/auth.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/auth.c
+--- linux-2.6.32.60/fs/nfsd/auth.c 2009-12-03 20:02:52.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/auth.c 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/sunrpc/svcauth.h>
#include <linux/nfsd/nfsd.h>
@@ -6044,9 +6044,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/auth.c linux-2.6.32.59-vs2.3.0.36.
rqgi = rqstp->rq_cred.cr_group_info;
-diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs3xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c
---- linux-2.6.32.59/fs/nfsd/nfs3xdr.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfsd/nfs3xdr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c
+--- linux-2.6.32.60/fs/nfsd/nfs3xdr.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfs3xdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
@@ -6097,9 +6097,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs3xdr.c linux-2.6.32.59-vs2.3.0.
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs4xdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c
---- linux-2.6.32.59/fs/nfsd/nfs4xdr.c 2012-03-20 11:26:27.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfsd/nfs4xdr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c
+--- linux-2.6.32.60/fs/nfsd/nfs4xdr.c 2012-10-20 11:50:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfs4xdr.c 2012-10-20 12:09:09.000000000 +0200
@@ -57,6 +57,7 @@
#include <linux/nfs4_acl.h>
#include <linux/sunrpc/gss_api.h>
@@ -6129,9 +6129,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfs4xdr.c linux-2.6.32.59-vs2.3.0.
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfsxdr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c
---- linux-2.6.32.59/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/nfsd/nfsxdr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c
+--- linux-2.6.32.60/fs/nfsd/nfsxdr.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/nfsd/nfsxdr.c 2011-06-10 13:03:02.000000000 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
@@ -6180,9 +6180,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/nfsd/nfsxdr.c linux-2.6.32.59-vs2.3.0.3
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlm/dlmfs.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c
---- linux-2.6.32.59/fs/ocfs2/dlm/dlmfs.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/dlm/dlmfs.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c
+--- linux-2.6.32.60/fs/ocfs2/dlm/dlmfs.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlm/dlmfs.c 2011-06-10 13:03:02.000000000 +0200
@@ -43,6 +43,7 @@
#include <linux/init.h>
#include <linux/string.h>
@@ -6207,9 +6207,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlm/dlmfs.c linux-2.6.32.59-vs2.3
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c
---- linux-2.6.32.59/fs/ocfs2/dlmglue.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/dlmglue.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c
+--- linux-2.6.32.60/fs/ocfs2/dlmglue.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.c 2011-06-10 13:03:02.000000000 +0200
@@ -1991,6 +1991,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);
@@ -6226,9 +6226,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.c linux-2.6.32.59-vs2.3.0
inode->i_mode = be16_to_cpu(lvb->lvb_imode);
inode->i_nlink = be16_to_cpu(lvb->lvb_inlink);
ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h
---- linux-2.6.32.59/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/dlmglue.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h
+--- linux-2.6.32.60/fs/ocfs2/dlmglue.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/dlmglue.h 2011-06-10 13:03:02.000000000 +0200
@@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
__be16 lvb_inlink;
__be32 lvb_iattr;
@@ -6239,9 +6239,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/dlmglue.h linux-2.6.32.59-vs2.3.0
};
#define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/file.c
---- linux-2.6.32.59/fs/ocfs2/file.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/file.c
+--- linux-2.6.32.60/fs/ocfs2/file.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -960,13 +960,15 @@ int ocfs2_setattr(struct dentry *dentry,
mlog(0, "uid change: %d\n", attr->ia_uid);
if (attr->ia_valid & ATTR_GID)
@@ -6259,9 +6259,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/file.c linux-2.6.32.59-vs2.3.0.36
if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) {
mlog(0, "can't handle attrs: 0x%x\n", attr->ia_valid);
return 0;
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.c
---- linux-2.6.32.59/fs/ocfs2/inode.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/inode.c
+--- linux-2.6.32.60/fs/ocfs2/inode.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -29,6 +29,7 @@
#include <linux/highmem.h>
#include <linux/pagemap.h>
@@ -6358,9 +6358,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.c linux-2.6.32.59-vs2.3.0.3
/* Fast symlinks will have i_size but no allocated clusters. */
if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.h
---- linux-2.6.32.59/fs/ocfs2/inode.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/inode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/inode.h
+--- linux-2.6.32.60/fs/ocfs2/inode.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -150,6 +150,7 @@ struct buffer_head *ocfs2_bread(struct i
void ocfs2_set_inode_flags(struct inode *inode);
@@ -6369,9 +6369,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/inode.h linux-2.6.32.59-vs2.3.0.3
static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
{
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c
---- linux-2.6.32.59/fs/ocfs2/ioctl.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c
+--- linux-2.6.32.60/fs/ocfs2/ioctl.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -42,7 +42,41 @@ static int ocfs2_get_inode_attr(struct i
return status;
}
@@ -6435,9 +6435,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ioctl.c linux-2.6.32.59-vs2.3.0.3
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-2.6.32.59/fs/ocfs2/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/namei.c
---- linux-2.6.32.59/fs/ocfs2/namei.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/namei.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/namei.c
+--- linux-2.6.32.60/fs/ocfs2/namei.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/slab.h>
#include <linux/highmem.h>
@@ -6468,9 +6468,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/namei.c linux-2.6.32.59-vs2.3.0.3
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-2.6.32.59/fs/ocfs2/ocfs2.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h
---- linux-2.6.32.59/fs/ocfs2/ocfs2.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/ocfs2.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.60/fs/ocfs2/ocfs2.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ocfs2.h 2011-06-10 13:03:02.000000000 +0200
@@ -248,6 +248,7 @@ enum ocfs2_mount_options
OCFS2_MOUNT_POSIX_ACL = 1 << 8, /* POSIX access control lists */
OCFS2_MOUNT_USRQUOTA = 1 << 9, /* We support user quotas */
@@ -6479,9 +6479,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ocfs2.h linux-2.6.32.59-vs2.3.0.3
};
#define OCFS2_OSB_SOFT_RO 0x0001
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ocfs2_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h
---- linux-2.6.32.59/fs/ocfs2/ocfs2_fs.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/ocfs2_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h
+--- linux-2.6.32.60/fs/ocfs2/ocfs2_fs.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/ocfs2_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -231,18 +231,23 @@
#define OCFS2_HAS_REFCOUNT_FL (0x0010)
@@ -6517,9 +6517,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/ocfs2_fs.h linux-2.6.32.59-vs2.3.
/*
* Extent record flags (e_node.leaf.flags)
-diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/super.c
---- linux-2.6.32.59/fs/ocfs2/super.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/ocfs2/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/ocfs2/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/super.c
+--- linux-2.6.32.60/fs/ocfs2/super.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/ocfs2/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -173,6 +173,7 @@ enum {
Opt_noacl,
Opt_usrquota,
@@ -6583,9 +6583,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/ocfs2/super.c linux-2.6.32.59-vs2.3.0.3
default:
mlog(ML_ERROR,
"Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-2.6.32.59/fs/open.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/open.c
---- linux-2.6.32.59/fs/open.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/open.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/open.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/open.c
+--- linux-2.6.32.60/fs/open.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/open.c 2011-06-10 13:03:02.000000000 +0200
@@ -30,22 +30,30 @@
#include <linux/audit.h>
#include <linux/falloc.h>
@@ -6691,9 +6691,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/open.c linux-2.6.32.59-vs2.3.0.36.29.9/
}
void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/array.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/array.c
---- linux-2.6.32.59/fs/proc/array.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/array.c 2011-06-10 18:44:08.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/array.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/array.c
+--- linux-2.6.32.60/fs/proc/array.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/array.c 2011-06-10 18:44:08.000000000 +0200
@@ -82,6 +82,8 @@
#include <linux/pid_namespace.h>
#include <linux/ptrace.h>
@@ -6808,9 +6808,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/array.c linux-2.6.32.59-vs2.3.0.36
seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/base.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/base.c
---- linux-2.6.32.59/fs/proc/base.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/base.c 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/base.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/base.c
+--- linux-2.6.32.60/fs/proc/base.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/base.c 2011-11-17 12:18:26.000000000 +0100
@@ -81,6 +81,8 @@
#include <linux/elf.h>
#include <linux/pid_namespace.h>
@@ -6952,9 +6952,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/base.c linux-2.6.32.59-vs2.3.0.36.
ns = dentry->d_sb->s_fs_info;
rcu_read_lock();
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/generic.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/generic.c
---- linux-2.6.32.59/fs/proc/generic.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/generic.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/generic.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/generic.c
+--- linux-2.6.32.60/fs/proc/generic.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/generic.c 2011-06-10 13:03:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <linux/bitops.h>
#include <linux/spinlock.h>
@@ -7016,9 +7016,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/generic.c linux-2.6.32.59-vs2.3.0.
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/inode.c
---- linux-2.6.32.59/fs/proc/inode.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/inode.c
+--- linux-2.6.32.60/fs/proc/inode.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -459,6 +459,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -7028,9 +7028,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/inode.c linux-2.6.32.59-vs2.3.0.36
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/internal.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/internal.h
---- linux-2.6.32.59/fs/proc/internal.h 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/internal.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/internal.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/internal.h
+--- linux-2.6.32.60/fs/proc/internal.h 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/internal.h 2011-06-10 13:03:02.000000000 +0200
@@ -10,6 +10,7 @@
*/
@@ -7067,9 +7067,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/internal.h linux-2.6.32.59-vs2.3.0
static inline int proc_fd(struct inode *inode)
{
return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/loadavg.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/loadavg.c
---- linux-2.6.32.59/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/loadavg.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/loadavg.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/loadavg.c
+--- linux-2.6.32.60/fs/proc/loadavg.c 2009-09-10 15:26:23.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/loadavg.c 2011-06-10 13:03:02.000000000 +0200
@@ -12,15 +12,27 @@
static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -7099,9 +7099,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/loadavg.c linux-2.6.32.59-vs2.3.0.
task_active_pid_ns(current)->last_pid);
return 0;
}
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/meminfo.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/meminfo.c
---- linux-2.6.32.59/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/meminfo.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/meminfo.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/meminfo.c
+--- linux-2.6.32.60/fs/proc/meminfo.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/meminfo.c 2011-06-10 13:03:02.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;
@@ -7112,9 +7112,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/meminfo.c linux-2.6.32.59-vs2.3.0.
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/root.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/root.c
---- linux-2.6.32.59/fs/proc/root.c 2009-06-11 17:13:07.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/root.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/root.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/root.c
+--- linux-2.6.32.60/fs/proc/root.c 2009-06-11 17:13:07.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/root.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,9 +18,14 @@
#include <linux/bitops.h>
#include <linux/mount.h>
@@ -7146,9 +7146,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/root.c linux-2.6.32.59-vs2.3.0.36.
};
int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-2.6.32.59/fs/proc/uptime.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/uptime.c
---- linux-2.6.32.59/fs/proc/uptime.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/proc/uptime.c 2012-02-09 10:58:46.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/proc/uptime.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/uptime.c
+--- linux-2.6.32.60/fs/proc/uptime.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/proc/uptime.c 2012-02-09 10:58:46.000000000 +0100
@@ -5,6 +5,7 @@
#include <linux/seq_file.h>
#include <linux/time.h>
@@ -7168,9 +7168,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/proc/uptime.c linux-2.6.32.59-vs2.3.0.3
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-2.6.32.59/fs/quota/quota.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/quota/quota.c
---- linux-2.6.32.59/fs/quota/quota.c 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/quota/quota.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/quota/quota.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/quota/quota.c
+--- linux-2.6.32.60/fs/quota/quota.c 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/quota/quota.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/capability.h>
#include <linux/quotaops.h>
@@ -7276,18 +7276,18 @@ diff -NurpP --minimal linux-2.6.32.59/fs/quota/quota.c linux-2.6.32.59-vs2.3.0.3
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/file.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/file.c
---- linux-2.6.32.59/fs/reiserfs/file.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/file.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/file.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/file.c
+--- linux-2.6.32.60/fs/reiserfs/file.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/file.c 2011-06-10 13:03:02.000000000 +0200
@@ -307,4 +307,5 @@ const struct inode_operations reiserfs_f
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/inode.c
---- linux-2.6.32.59/fs/reiserfs/inode.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/inode.c
+--- linux-2.6.32.60/fs/reiserfs/inode.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/writeback.h>
#include <linux/quotaops.h>
@@ -7456,9 +7456,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/inode.c linux-2.6.32.59-vs2.3.
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c
---- linux-2.6.32.59/fs/reiserfs/ioctl.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c
+--- linux-2.6.32.60/fs/reiserfs/ioctl.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -7,11 +7,27 @@
#include <linux/mount.h>
#include <linux/reiserfs_fs.h>
@@ -7526,9 +7526,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/ioctl.c linux-2.6.32.59-vs2.3.
sd_attrs_to_i_attrs(flags, inode);
REISERFS_I(inode)->i_attrs = flags;
inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/namei.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/namei.c
---- linux-2.6.32.59/fs/reiserfs/namei.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/namei.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/namei.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/namei.c
+--- linux-2.6.32.60/fs/reiserfs/namei.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/namei.c 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,7 @@
#include <linux/reiserfs_acl.h>
#include <linux/reiserfs_xattr.h>
@@ -7561,9 +7561,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/namei.c linux-2.6.32.59-vs2.3.
};
/*
-diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/super.c
---- linux-2.6.32.59/fs/reiserfs/super.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/super.c 2012-02-09 10:33:19.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/super.c
+--- linux-2.6.32.60/fs/reiserfs/super.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/super.c 2012-02-09 10:33:19.000000000 +0100
@@ -888,6 +888,14 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -7605,9 +7605,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/super.c linux-2.6.32.59-vs2.3.
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-2.6.32.59/fs/reiserfs/xattr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/xattr.c
---- linux-2.6.32.59/fs/reiserfs/xattr.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/reiserfs/xattr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/reiserfs/xattr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/xattr.c
+--- linux-2.6.32.60/fs/reiserfs/xattr.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/reiserfs/xattr.c 2011-06-10 13:03:02.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -7616,9 +7616,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/reiserfs/xattr.c linux-2.6.32.59-vs2.3.
#include <linux/file.h>
#include <linux/pagemap.h>
#include <linux/xattr.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/stat.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/stat.c
---- linux-2.6.32.59/fs/stat.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/stat.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/stat.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/stat.c
+--- linux-2.6.32.60/fs/stat.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/stat.c 2011-06-10 13:03:02.000000000 +0200
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -7627,9 +7627,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/stat.c linux-2.6.32.59-vs2.3.0.36.29.9/
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.32.59/fs/super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/super.c
---- linux-2.6.32.59/fs/super.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/super.c
+--- linux-2.6.32.60/fs/super.c 2012-10-20 11:50:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/super.c 2011-06-10 13:03:02.000000000 +0200
@@ -37,6 +37,9 @@
#include <linux/kobject.h>
#include <linux/mutex.h>
@@ -7679,9 +7679,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/super.c linux-2.6.32.59-vs2.3.0.36.29.9
if (error)
goto out_sb;
-diff -NurpP --minimal linux-2.6.32.59/fs/sysfs/mount.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/sysfs/mount.c
---- linux-2.6.32.59/fs/sysfs/mount.c 2009-06-11 17:13:08.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/sysfs/mount.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/sysfs/mount.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/sysfs/mount.c
+--- linux-2.6.32.60/fs/sysfs/mount.c 2009-06-11 17:13:08.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/sysfs/mount.c 2011-06-10 13:03:02.000000000 +0200
@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -7691,9 +7691,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/sysfs/mount.c linux-2.6.32.59-vs2.3.0.3
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.32.59/fs/utimes.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/utimes.c
---- linux-2.6.32.59/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/utimes.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/utimes.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/utimes.c
+--- linux-2.6.32.60/fs/utimes.c 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/utimes.c 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,8 @@
#include <linux/stat.h>
#include <linux/utime.h>
@@ -7703,9 +7703,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/utimes.c linux-2.6.32.59-vs2.3.0.36.29.
#include <asm/uaccess.h>
#include <asm/unistd.h>
-diff -NurpP --minimal linux-2.6.32.59/fs/xattr.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xattr.c
---- linux-2.6.32.59/fs/xattr.c 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xattr.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xattr.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xattr.c
+--- linux-2.6.32.60/fs/xattr.c 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xattr.c 2011-06-10 13:03:02.000000000 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7723,9 +7723,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xattr.c linux-2.6.32.59-vs2.3.0.36.29.9
/* In user.* namespace, only regular files and directories can have
* extended attributes. For sticky directories, only the owner and
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.60/fs/xfs/linux-2.6/xfs_ioctl.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.c 2011-06-10 13:03:02.000000000 +0200
@@ -34,7 +34,6 @@
#include "xfs_dir2_sf.h"
#include "xfs_dinode.h"
@@ -7793,9 +7793,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.
return xfs_ioc_setxflags(ip, filp, arg);
case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.h 2009-03-24 14:22:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-2.6.32.60/fs/xfs/linux-2.6/xfs_ioctl.h 2009-03-24 14:22:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_ioctl.h 2011-06-10 13:03:02.000000000 +0200
@@ -70,6 +70,12 @@ xfs_handle_to_dentry(
void __user *uhandle,
u32 hlen);
@@ -7809,9 +7809,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_ioctl.h linux-2.6.32.
extern long
xfs_file_ioctl(
struct file *filp,
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_iops.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.60/fs/xfs/linux-2.6/xfs_iops.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_iops.c 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,7 @@
#include "xfs_attr_sf.h"
#include "xfs_dinode.h"
@@ -7887,9 +7887,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.5
switch (inode->i_mode & S_IFMT) {
case S_IFBLK:
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_linux.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.32.60/fs/xfs/linux-2.6/xfs_linux.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_linux.h 2011-06-10 13:03:02.000000000 +0200
@@ -119,6 +119,7 @@
#define current_cpu() (raw_smp_processor_id())
@@ -7898,9 +7898,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.32.
#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-2.6.32.59/fs/xfs/linux-2.6/xfs_super.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.32.59/fs/xfs/linux-2.6/xfs_super.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/linux-2.6/xfs_super.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.32.60/fs/xfs/linux-2.6/xfs_super.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/linux-2.6/xfs_super.c 2011-06-10 13:03:02.000000000 +0200
@@ -117,6 +117,9 @@ mempool_t *xfs_ioend_pool;
#define MNTOPT_DMAPI "dmapi" /* DMI enabled (DMAPI / XDSM) */
#define MNTOPT_XDSM "xdsm" /* DMI enabled (DMAPI / XDSM) */
@@ -7973,9 +7973,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/linux-2.6/xfs_super.c linux-2.6.32.
sb->s_magic = XFS_SB_MAGIC;
sb->s_blocksize = mp->m_sb.sb_blocksize;
sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_dinode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h
---- linux-2.6.32.59/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_dinode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h
+--- linux-2.6.32.60/fs/xfs/xfs_dinode.h 2009-06-11 17:13:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_dinode.h 2011-06-10 13:03:02.000000000 +0200
@@ -50,7 +50,9 @@ typedef struct xfs_dinode {
__be32 di_gid; /* owner's group id */
__be32 di_nlink; /* number of links to file */
@@ -8016,9 +8016,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_dinode.h linux-2.6.32.59-vs2.3.
+#define XFS_DIVFLAG_COW 0x02
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h
---- linux-2.6.32.59/fs/xfs/xfs_fs.h 2009-12-03 20:02:53.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h
+--- linux-2.6.32.60/fs/xfs/xfs_fs.h 2009-12-03 20:02:53.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_fs.h 2011-06-10 13:03:02.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 */
@@ -8039,9 +8039,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_fs.h linux-2.6.32.59-vs2.3.0.36
__u32 bs_dmevmask; /* DMIG event mask */
__u16 bs_dmstate; /* DMIG state info */
__u16 bs_aextents; /* attribute number of extents */
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_ialloc.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c
---- linux-2.6.32.59/fs/xfs/xfs_ialloc.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_ialloc.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c
+--- linux-2.6.32.60/fs/xfs/xfs_ialloc.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_ialloc.c 2011-06-10 13:03:02.000000000 +0200
@@ -41,7 +41,6 @@
#include "xfs_error.h"
#include "xfs_bmap.h"
@@ -8050,9 +8050,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_ialloc.c linux-2.6.32.59-vs2.3.
/*
* Allocation group level functions.
*/
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c
---- linux-2.6.32.59/fs/xfs/xfs_inode.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_inode.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c
+--- linux-2.6.32.60/fs/xfs/xfs_inode.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_inode.c 2011-06-10 13:03:02.000000000 +0200
@@ -249,6 +249,7 @@ xfs_inotobp(
return 0;
}
@@ -8227,9 +8227,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.c linux-2.6.32.59-vs2.3.0
/* Wrap, we never let the log put out DI_MAX_FLUSH */
if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h
---- linux-2.6.32.59/fs/xfs/xfs_inode.h 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_inode.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h
+--- linux-2.6.32.60/fs/xfs/xfs_inode.h 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
@@ -8250,9 +8250,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_inode.h linux-2.6.32.59-vs2.3.0
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-2.6.32.59/fs/xfs/xfs_itable.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c
---- linux-2.6.32.59/fs/xfs/xfs_itable.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_itable.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c
+--- linux-2.6.32.60/fs/xfs/xfs_itable.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_itable.c 2011-06-10 13:03:02.000000000 +0200
@@ -100,6 +100,7 @@ xfs_bulkstat_one_int(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -8261,9 +8261,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_itable.c linux-2.6.32.59-vs2.3.
buf->bs_size = dic->di_size;
/*
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_log_recover.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c
---- linux-2.6.32.59/fs/xfs/xfs_log_recover.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_log_recover.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c
+--- linux-2.6.32.60/fs/xfs/xfs_log_recover.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_log_recover.c 2012-10-20 12:09:10.000000000 +0200
@@ -2467,7 +2467,8 @@ xlog_recover_do_inode_trans(
}
@@ -8274,9 +8274,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_log_recover.c linux-2.6.32.59-v
/* the rest is in on-disk format */
if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_mount.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h
---- linux-2.6.32.59/fs/xfs/xfs_mount.h 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_mount.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h
+--- linux-2.6.32.60/fs/xfs/xfs_mount.h 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_mount.h 2011-06-10 13:03:02.000000000 +0200
@@ -285,6 +285,7 @@ typedef struct xfs_mount {
allocator */
#define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */
@@ -8285,9 +8285,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_mount.h linux-2.6.32.59-vs2.3.0
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.c linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c
---- linux-2.6.32.59/fs/xfs/xfs_vnodeops.c 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_vnodeops.c linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.32.60/fs/xfs/xfs_vnodeops.c 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.c 2012-10-20 12:09:10.000000000 +0200
@@ -54,6 +54,80 @@
#include "xfs_filestream.h"
#include "xfs_vnodeops.h"
@@ -8427,9 +8427,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.c linux-2.6.32.59-vs2.
if (iuid != uid) {
if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.h linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h
---- linux-2.6.32.59/fs/xfs/xfs_vnodeops.h 2012-03-20 11:26:28.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/fs/xfs/xfs_vnodeops.h linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h
+--- linux-2.6.32.60/fs/xfs/xfs_vnodeops.h 2012-10-20 11:50:09.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/fs/xfs/xfs_vnodeops.h 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@ struct xfs_inode;
struct xfs_iomap;
@@ -8438,9 +8438,9 @@ diff -NurpP --minimal linux-2.6.32.59/fs/xfs/xfs_vnodeops.h linux-2.6.32.59-vs2.
int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-2.6.32.59/include/asm-generic/tlb.h linux-2.6.32.59-vs2.3.0.36.29.9/include/asm-generic/tlb.h
---- linux-2.6.32.59/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/asm-generic/tlb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/asm-generic/tlb.h linux-2.6.32.60-vs2.3.0.36.29.9/include/asm-generic/tlb.h
+--- linux-2.6.32.60/include/asm-generic/tlb.h 2009-09-10 15:26:24.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/asm-generic/tlb.h 2011-06-10 13:03:02.000000000 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
@@ -8449,9 +8449,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/asm-generic/tlb.h linux-2.6.32.59-
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.32.59/include/linux/Kbuild linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/Kbuild
---- linux-2.6.32.59/include/linux/Kbuild 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/Kbuild 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/Kbuild linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/Kbuild
+--- linux-2.6.32.60/include/linux/Kbuild 2009-12-03 20:02:54.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/Kbuild 2011-06-10 13:03:02.000000000 +0200
@@ -382,5 +382,8 @@ unifdef-y += xattr.h
unifdef-y += xfrm.h
@@ -8461,9 +8461,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/Kbuild linux-2.6.32.59-vs2.3
header-y += wimax.h
header-y += wimax/
+
-diff -NurpP --minimal linux-2.6.32.59/include/linux/capability.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/capability.h
---- linux-2.6.32.59/include/linux/capability.h 2009-12-03 20:02:54.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/capability.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/capability.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/capability.h
+--- linux-2.6.32.60/include/linux/capability.h 2009-12-03 20:02:54.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/capability.h 2011-06-10 13:03:02.000000000 +0200
@@ -285,6 +285,7 @@ struct cpu_vfs_cap_data {
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8487,18 +8487,18 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/capability.h linux-2.6.32.59
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-diff -NurpP --minimal linux-2.6.32.59/include/linux/devpts_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/devpts_fs.h
---- linux-2.6.32.59/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/devpts_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/devpts_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/devpts_fs.h
+--- linux-2.6.32.60/include/linux/devpts_fs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/devpts_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
#endif
-
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/ext2_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext2_fs.h
---- linux-2.6.32.59/include/linux/ext2_fs.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext2_fs.h 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/include/linux/ext2_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ext2_fs.h
+--- linux-2.6.32.60/include/linux/ext2_fs.h 2012-10-20 11:50:11.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ext2_fs.h 2011-11-17 12:18:26.000000000 +0100
@@ -189,8 +189,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) */
@@ -8538,9 +8538,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/ext2_fs.h linux-2.6.32.59-vs
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.32.59/include/linux/ext3_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext3_fs.h
---- linux-2.6.32.59/include/linux/ext3_fs.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ext3_fs.h 2011-11-17 12:18:26.000000000 +0100
+diff -NurpP --minimal linux-2.6.32.60/include/linux/ext3_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ext3_fs.h
+--- linux-2.6.32.60/include/linux/ext3_fs.h 2012-10-20 11:50:11.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ext3_fs.h 2011-11-17 12:18:26.000000000 +0100
@@ -173,10 +173,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) */
@@ -8592,9 +8592,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/ext3_fs.h linux-2.6.32.59-vs
/* ioctl.c */
extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/fs.h
---- linux-2.6.32.59/include/linux/fs.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/fs.h 2011-08-08 22:40:36.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/fs.h
+--- linux-2.6.32.60/include/linux/fs.h 2012-10-20 11:50:11.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/fs.h 2012-10-20 12:09:11.000000000 +0200
@@ -208,6 +208,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 */
@@ -8741,7 +8741,7 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0
struct file_ra_state f_ra;
u64 f_version;
-@@ -1070,6 +1106,7 @@ struct file_lock {
+@@ -1071,6 +1107,7 @@ struct file_lock {
struct file *fl_file;
loff_t fl_start;
loff_t fl_end;
@@ -8749,7 +8749,7 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0
struct fasync_struct * fl_fasync; /* for lease break notifications */
unsigned long fl_break_time; /* for nonblocking lease breaks */
-@@ -1537,6 +1574,7 @@ struct inode_operations {
+@@ -1538,6 +1575,7 @@ struct inode_operations {
ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*removexattr) (struct dentry *, const char *);
@@ -8757,7 +8757,7 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0
void (*truncate_range)(struct inode *, loff_t, loff_t);
long (*fallocate)(struct inode *inode, int mode, loff_t offset,
loff_t len);
-@@ -1557,6 +1595,7 @@ extern ssize_t vfs_readv(struct file *,
+@@ -1558,6 +1596,7 @@ extern ssize_t vfs_readv(struct file *,
unsigned long, loff_t *);
extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
unsigned long, loff_t *);
@@ -8765,7 +8765,7 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0
struct super_operations {
struct inode *(*alloc_inode)(struct super_block *sb);
-@@ -2356,6 +2395,7 @@ extern int dcache_dir_open(struct inode
+@@ -2357,6 +2396,7 @@ extern int dcache_dir_open(struct inode
extern int dcache_dir_close(struct inode *, struct file *);
extern loff_t dcache_dir_lseek(struct file *, loff_t, int);
extern int dcache_readdir(struct file *, void *, filldir_t);
@@ -8773,9 +8773,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/fs.h linux-2.6.32.59-vs2.3.0
extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
extern int simple_statfs(struct dentry *, struct kstatfs *);
extern int simple_link(struct dentry *, struct inode *, struct dentry *);
-diff -NurpP --minimal linux-2.6.32.59/include/linux/gfs2_ondisk.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h
---- linux-2.6.32.59/include/linux/gfs2_ondisk.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/gfs2_ondisk.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h
+--- linux-2.6.32.60/include/linux/gfs2_ondisk.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/gfs2_ondisk.h 2011-06-10 13:03:02.000000000 +0200
@@ -235,6 +235,9 @@ enum {
gfs2fl_NoAtime = 7,
gfs2fl_Sync = 8,
@@ -8796,9 +8796,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/gfs2_ondisk.h linux-2.6.32.5
#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-2.6.32.59/include/linux/if_tun.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/if_tun.h
---- linux-2.6.32.59/include/linux/if_tun.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/if_tun.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/if_tun.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/if_tun.h
+--- linux-2.6.32.60/include/linux/if_tun.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/if_tun.h 2011-06-10 13:03:02.000000000 +0200
@@ -48,6 +48,7 @@
#define TUNGETIFF _IOR('T', 210, unsigned int)
#define TUNGETSNDBUF _IOR('T', 211, int)
@@ -8807,9 +8807,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/if_tun.h linux-2.6.32.59-vs2
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
-diff -NurpP --minimal linux-2.6.32.59/include/linux/init_task.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/init_task.h
---- linux-2.6.32.59/include/linux/init_task.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/init_task.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/init_task.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/init_task.h
+--- linux-2.6.32.60/include/linux/init_task.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/init_task.h 2011-06-10 13:03:02.000000000 +0200
@@ -184,6 +184,10 @@ extern struct cred init_cred;
INIT_FTRACE_GRAPH \
INIT_TRACE_RECURSION \
@@ -8821,9 +8821,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/init_task.h linux-2.6.32.59-
}
-diff -NurpP --minimal linux-2.6.32.59/include/linux/ipc.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ipc.h
---- linux-2.6.32.59/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/ipc.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/ipc.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ipc.h
+--- linux-2.6.32.60/include/linux/ipc.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/ipc.h 2011-06-10 13:03:02.000000000 +0200
@@ -91,6 +91,7 @@ struct kern_ipc_perm
key_t key;
uid_t uid;
@@ -8832,9 +8832,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/ipc.h linux-2.6.32.59-vs2.3.
uid_t cuid;
gid_t cgid;
mode_t mode;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/loop.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/loop.h
---- linux-2.6.32.59/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/loop.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/loop.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/loop.h
+--- linux-2.6.32.60/include/linux/loop.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/loop.h 2011-06-10 13:03:02.000000000 +0200
@@ -45,6 +45,7 @@ struct loop_device {
struct loop_func_table *lo_encryption;
__u32 lo_init[2];
@@ -8843,9 +8843,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/loop.h linux-2.6.32.59-vs2.3
int (*ioctl)(struct loop_device *, int cmd,
unsigned long arg);
-diff -NurpP --minimal linux-2.6.32.59/include/linux/magic.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/magic.h
---- linux-2.6.32.59/include/linux/magic.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/magic.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/magic.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/magic.h
+--- linux-2.6.32.60/include/linux/magic.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/magic.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,7 +3,7 @@
#define ADFS_SUPER_MAGIC 0xadf5
@@ -8863,9 +8863,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/magic.h linux-2.6.32.59-vs2.
#define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */
#define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/major.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/major.h
---- linux-2.6.32.59/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/major.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/major.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/major.h
+--- linux-2.6.32.60/include/linux/major.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/major.h 2011-06-10 13:03:02.000000000 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -8874,9 +8874,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/major.h linux-2.6.32.59-vs2.
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.32.59/include/linux/memcontrol.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/memcontrol.h
---- linux-2.6.32.59/include/linux/memcontrol.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/memcontrol.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/memcontrol.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/memcontrol.h
+--- linux-2.6.32.60/include/linux/memcontrol.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/memcontrol.h 2011-06-10 13:03:02.000000000 +0200
@@ -70,6 +70,13 @@ int task_in_mem_cgroup(struct task_struc
extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
@@ -8891,9 +8891,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/memcontrol.h linux-2.6.32.59
static inline
int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
{
-diff -NurpP --minimal linux-2.6.32.59/include/linux/mm_types.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mm_types.h
---- linux-2.6.32.59/include/linux/mm_types.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mm_types.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/mm_types.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/mm_types.h
+--- linux-2.6.32.60/include/linux/mm_types.h 2012-10-20 11:50:11.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/mm_types.h 2011-06-10 13:03:02.000000000 +0200
@@ -246,6 +246,7 @@ struct mm_struct {
/* Architecture-specific MM context */
@@ -8902,9 +8902,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/mm_types.h linux-2.6.32.59-v
/* Swap token stuff */
/*
-diff -NurpP --minimal linux-2.6.32.59/include/linux/mount.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mount.h
---- linux-2.6.32.59/include/linux/mount.h 2009-09-10 15:26:25.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/mount.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/mount.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/mount.h
+--- linux-2.6.32.60/include/linux/mount.h 2009-09-10 15:26:25.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/mount.h 2011-06-10 13:03:02.000000000 +0200
@@ -36,6 +36,9 @@ struct mnt_namespace;
#define MNT_UNBINDABLE 0x2000 /* if the vfsmount is a unbindable mount */
#define MNT_PNODE_MASK 0x3000 /* propagation flag mask */
@@ -8923,9 +8923,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/mount.h linux-2.6.32.59-vs2.
};
static inline int *get_mnt_writers_ptr(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.32.59/include/linux/net.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/net.h
---- linux-2.6.32.59/include/linux/net.h 2009-12-03 20:02:55.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/net.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/net.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/net.h
+--- linux-2.6.32.60/include/linux/net.h 2009-12-03 20:02:55.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/net.h 2011-06-10 13:03:02.000000000 +0200
@@ -69,6 +69,7 @@ struct net;
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -8934,9 +8934,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/net.h linux-2.6.32.59-vs2.3.
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.32.59/include/linux/nfs_mount.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nfs_mount.h
---- linux-2.6.32.59/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nfs_mount.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/nfs_mount.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/nfs_mount.h
+--- linux-2.6.32.60/include/linux/nfs_mount.h 2009-03-24 14:22:43.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/nfs_mount.h 2011-06-10 13:03:02.000000000 +0200
@@ -63,7 +63,8 @@ struct nfs_mount_data {
#define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */
#define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */
@@ -8947,9 +8947,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/nfs_mount.h linux-2.6.32.59-
/* The following are for internal use only */
#define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000
-diff -NurpP --minimal linux-2.6.32.59/include/linux/nsproxy.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nsproxy.h
---- linux-2.6.32.59/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/nsproxy.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/nsproxy.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/nsproxy.h
+--- linux-2.6.32.60/include/linux/nsproxy.h 2009-06-11 17:13:17.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/nsproxy.h 2011-06-10 13:03:02.000000000 +0200
@@ -3,6 +3,7 @@
#include <linux/spinlock.h>
@@ -8998,9 +8998,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/nsproxy.h linux-2.6.32.59-vs
}
#ifdef CONFIG_CGROUP_NS
-diff -NurpP --minimal linux-2.6.32.59/include/linux/pid.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/pid.h
---- linux-2.6.32.59/include/linux/pid.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/pid.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/pid.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/pid.h
+--- linux-2.6.32.60/include/linux/pid.h 2012-10-20 11:50:11.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/pid.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -9019,9 +9019,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/pid.h linux-2.6.32.59-vs2.3.
pid_t pid_vnr(struct pid *pid);
#define do_each_pid_task(pid, type, task) \
-diff -NurpP --minimal linux-2.6.32.59/include/linux/proc_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/proc_fs.h
---- linux-2.6.32.59/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/proc_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/proc_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/proc_fs.h
+--- linux-2.6.32.60/include/linux/proc_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/proc_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -56,6 +56,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -9057,9 +9057,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/proc_fs.h linux-2.6.32.59-vs
int fd;
union proc_op op;
struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/quotaops.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/quotaops.h
---- linux-2.6.32.59/include/linux/quotaops.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/quotaops.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/quotaops.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/quotaops.h
+--- linux-2.6.32.60/include/linux/quotaops.h 2012-10-20 11:50:12.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/quotaops.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,7 @@
#define _LINUX_QUOTAOPS_
@@ -9218,9 +9218,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/quotaops.h linux-2.6.32.59-v
inode_sub_bytes(inode, nr);
}
-diff -NurpP --minimal linux-2.6.32.59/include/linux/reboot.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reboot.h
---- linux-2.6.32.59/include/linux/reboot.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reboot.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/reboot.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reboot.h
+--- linux-2.6.32.60/include/linux/reboot.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reboot.h 2011-06-10 13:03:02.000000000 +0200
@@ -33,6 +33,7 @@
#define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4
#define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2
@@ -9229,9 +9229,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/reboot.h linux-2.6.32.59-vs2
#ifdef __KERNEL__
-diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h
---- linux-2.6.32.59/include/linux/reiserfs_fs.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/reiserfs_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h
+--- linux-2.6.32.60/include/linux/reiserfs_fs.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reiserfs_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -899,6 +899,11 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL FS_COMPR_FL
#define REISERFS_NOTAIL_FL FS_NOTAIL_FL
@@ -9262,9 +9262,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs.h linux-2.6.32.5
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs_sb.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.59/include/linux/reiserfs_fs_sb.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/reiserfs_fs_sb.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.60/include/linux/reiserfs_fs_sb.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/reiserfs_fs_sb.h 2011-06-10 13:03:02.000000000 +0200
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_EXPOSE_PRIVROOT,
REISERFS_BARRIER_NONE,
@@ -9273,9 +9273,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/reiserfs_fs_sb.h linux-2.6.3
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.32.59/include/linux/sched.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sched.h
---- linux-2.6.32.59/include/linux/sched.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sched.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/sched.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sched.h
+--- linux-2.6.32.60/include/linux/sched.h 2012-10-20 11:50:12.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sched.h 2011-06-10 13:03:02.000000000 +0200
@@ -389,25 +389,28 @@ extern void arch_unmap_area_topdown(stru
* The mm counters are not protected by its page_table_lock,
* so must be incremented atomically.
@@ -9373,9 +9373,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/sched.h linux-2.6.32.59-vs2.
}
-diff -NurpP --minimal linux-2.6.32.59/include/linux/shmem_fs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/shmem_fs.h
---- linux-2.6.32.59/include/linux/shmem_fs.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/shmem_fs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/shmem_fs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/shmem_fs.h
+--- linux-2.6.32.60/include/linux/shmem_fs.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/shmem_fs.h 2011-06-10 13:03:02.000000000 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -9386,9 +9386,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/shmem_fs.h linux-2.6.32.59-v
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/stat.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/stat.h
---- linux-2.6.32.59/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/stat.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/stat.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/stat.h
+--- linux-2.6.32.60/include/linux/stat.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/stat.h 2011-06-10 13:03:02.000000000 +0200
@@ -66,6 +66,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -9397,9 +9397,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/stat.h linux-2.6.32.59-vs2.3
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/auth.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h
---- linux-2.6.32.59/include/linux/sunrpc/auth.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/sunrpc/auth.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h
+--- linux-2.6.32.60/include/linux/sunrpc/auth.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sunrpc/auth.h 2011-06-10 13:03:02.000000000 +0200
@@ -25,6 +25,7 @@
struct auth_cred {
uid_t uid;
@@ -9408,9 +9408,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/auth.h linux-2.6.32.5
struct group_info *group_info;
unsigned char machine_cred : 1;
};
-diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/clnt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h
---- linux-2.6.32.59/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/sunrpc/clnt.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h
+--- linux-2.6.32.60/include/linux/sunrpc/clnt.h 2009-12-03 20:02:56.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sunrpc/clnt.h 2011-06-10 13:03:02.000000000 +0200
@@ -49,7 +49,8 @@ struct rpc_clnt {
unsigned int cl_softrtry : 1,/* soft timeouts */
cl_discrtry : 1,/* disconnect before retry */
@@ -9421,9 +9421,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/sunrpc/clnt.h linux-2.6.32.5
struct rpc_rtt * cl_rtt; /* RTO estimator data */
const struct rpc_timeout *cl_timeout; /* Timeout strategy */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/syscalls.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/syscalls.h
---- linux-2.6.32.59/include/linux/syscalls.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/syscalls.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/syscalls.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/syscalls.h
+--- linux-2.6.32.60/include/linux/syscalls.h 2012-10-20 11:50:12.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/syscalls.h 2011-06-10 13:03:02.000000000 +0200
@@ -548,6 +548,8 @@ asmlinkage long sys_symlink(const char _
asmlinkage long sys_unlink(const char __user *pathname);
asmlinkage long sys_rename(const char __user *oldname,
@@ -9433,9 +9433,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/syscalls.h linux-2.6.32.59-v
asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
-diff -NurpP --minimal linux-2.6.32.59/include/linux/sysctl.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysctl.h
---- linux-2.6.32.59/include/linux/sysctl.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysctl.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/sysctl.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sysctl.h
+--- linux-2.6.32.60/include/linux/sysctl.h 2012-10-20 11:50:12.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sysctl.h 2011-06-10 13:03:02.000000000 +0200
@@ -69,6 +69,7 @@ enum
CTL_ABI=9, /* Binary emulation */
CTL_CPU=10, /* CPU stuff (speed scaling, etc) */
@@ -9452,9 +9452,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/sysctl.h linux-2.6.32.59-vs2
KERN_SPARC_REBOOT=21, /* reboot command on Sparc */
KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/sysfs.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysfs.h
---- linux-2.6.32.59/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/sysfs.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/sysfs.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sysfs.h
+--- linux-2.6.32.60/include/linux/sysfs.h 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/sysfs.h 2011-06-10 13:03:02.000000000 +0200
@@ -17,6 +17,8 @@
#include <linux/list.h>
#include <asm/atomic.h>
@@ -9464,10 +9464,10 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/sysfs.h linux-2.6.32.59-vs2.
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/time.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/time.h
---- linux-2.6.32.59/include/linux/time.h 2012-03-20 11:26:29.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/time.h 2011-06-10 13:03:02.000000000 +0200
-@@ -238,6 +238,9 @@ static __always_inline void timespec_add
+diff -NurpP --minimal linux-2.6.32.60/include/linux/time.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/time.h
+--- linux-2.6.32.60/include/linux/time.h 2012-10-20 11:50:12.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/time.h 2012-10-20 12:09:11.000000000 +0200
+@@ -263,6 +263,9 @@ static __always_inline void timespec_add
a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
a->tv_nsec = ns;
}
@@ -9477,9 +9477,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/time.h linux-2.6.32.59-vs2.3
#endif /* __KERNEL__ */
#define NFDBITS __NFDBITS
-diff -NurpP --minimal linux-2.6.32.59/include/linux/types.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/types.h
---- linux-2.6.32.59/include/linux/types.h 2009-09-10 15:26:26.000000000 +0200
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/types.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/types.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/types.h
+--- linux-2.6.32.60/include/linux/types.h 2009-09-10 15:26:26.000000000 +0200
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/types.h 2011-06-10 13:03:02.000000000 +0200
@@ -37,6 +37,9 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -9490,9 +9490,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/types.h linux-2.6.32.59-vs2.
typedef unsigned long uintptr_t;
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vroot.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vroot.h
---- linux-2.6.32.59/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vroot.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vroot.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vroot.h
+--- linux-2.6.32.60/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vroot.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,51 @@
+
+/*
@@ -9545,9 +9545,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vroot.h linux-2.6.32.59-vs2.
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_base.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_base.h
---- linux-2.6.32.59/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_base.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_base.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_base.h
+--- linux-2.6.32.60/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_base.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,10 @@
+#ifndef _VS_BASE_H
+#define _VS_BASE_H
@@ -9559,9 +9559,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_base.h linux-2.6.32.59-vs
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_context.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_context.h
---- linux-2.6.32.59/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_context.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_context.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_context.h
+--- linux-2.6.32.60/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_context.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,242 @@
+#ifndef _VS_CONTEXT_H
+#define _VS_CONTEXT_H
@@ -9805,9 +9805,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_context.h linux-2.6.32.59
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cowbl.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cowbl.h
---- linux-2.6.32.59/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cowbl.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_cowbl.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_cowbl.h
+--- linux-2.6.32.60/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_cowbl.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_COWBL_H
+#define _VS_COWBL_H
@@ -9856,9 +9856,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cowbl.h linux-2.6.32.59-v
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cvirt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cvirt.h
---- linux-2.6.32.59/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_cvirt.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_cvirt.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_cvirt.h
+--- linux-2.6.32.60/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_cvirt.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_CVIRT_H
+#define _VS_CVIRT_H
@@ -9910,9 +9910,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_cvirt.h linux-2.6.32.59-v
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_device.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_device.h
---- linux-2.6.32.59/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_device.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_device.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_device.h
+--- linux-2.6.32.60/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_device.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,45 @@
+#ifndef _VS_DEVICE_H
+#define _VS_DEVICE_H
@@ -9959,9 +9959,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_device.h linux-2.6.32.59-
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_dlimit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_dlimit.h
---- linux-2.6.32.59/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_dlimit.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_dlimit.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_dlimit.h
+--- linux-2.6.32.60/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_dlimit.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,215 @@
+#ifndef _VS_DLIMIT_H
+#define _VS_DLIMIT_H
@@ -10178,9 +10178,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_dlimit.h linux-2.6.32.59-
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet.h
---- linux-2.6.32.59/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_inet.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_inet.h
+--- linux-2.6.32.60/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_inet.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,342 @@
+#ifndef _VS_INET_H
+#define _VS_INET_H
@@ -10524,9 +10524,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet.h linux-2.6.32.59-vs
+#else
+// #warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet6.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet6.h
---- linux-2.6.32.59/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_inet6.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_inet6.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_inet6.h
+--- linux-2.6.32.60/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_inet6.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,246 @@
+#ifndef _VS_INET6_H
+#define _VS_INET6_H
@@ -10774,9 +10774,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_inet6.h linux-2.6.32.59-v
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_limit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_limit.h
---- linux-2.6.32.59/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_limit.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_limit.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_limit.h
+--- linux-2.6.32.60/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_limit.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,140 @@
+#ifndef _VS_LIMIT_H
+#define _VS_LIMIT_H
@@ -10918,9 +10918,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_limit.h linux-2.6.32.59-v
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_memory.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_memory.h
---- linux-2.6.32.59/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_memory.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_memory.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_memory.h
+--- linux-2.6.32.60/include/linux/vs_memory.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_memory.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,159 @@
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
@@ -11081,9 +11081,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_memory.h linux-2.6.32.59-
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_network.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_network.h
---- linux-2.6.32.59/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_network.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_network.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_network.h
+--- linux-2.6.32.60/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_network.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,169 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -11254,9 +11254,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_network.h linux-2.6.32.59
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_pid.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_pid.h
---- linux-2.6.32.59/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_pid.h 2011-06-10 14:04:27.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_pid.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_pid.h
+--- linux-2.6.32.60/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_pid.h 2011-06-10 14:04:27.000000000 +0200
@@ -0,0 +1,50 @@
+#ifndef _VS_PID_H
+#define _VS_PID_H
@@ -11308,9 +11308,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_pid.h linux-2.6.32.59-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_sched.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_sched.h
---- linux-2.6.32.59/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_sched.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_sched.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_sched.h
+--- linux-2.6.32.60/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_sched.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,110 @@
+#ifndef _VS_SCHED_H
+#define _VS_SCHED_H
@@ -11422,9 +11422,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_sched.h linux-2.6.32.59-v
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_socket.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_socket.h
---- linux-2.6.32.59/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_socket.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_socket.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_socket.h
+--- linux-2.6.32.60/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_socket.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,67 @@
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
@@ -11493,9 +11493,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_socket.h linux-2.6.32.59-
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_tag.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_tag.h
---- linux-2.6.32.59/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_tag.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_tag.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_tag.h
+--- linux-2.6.32.60/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_tag.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VS_TAG_H
+#define _VS_TAG_H
@@ -11544,9 +11544,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_tag.h linux-2.6.32.59-vs2
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_time.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_time.h
---- linux-2.6.32.59/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vs_time.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vs_time.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_time.h
+--- linux-2.6.32.60/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vs_time.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VS_TIME_H
+#define _VS_TIME_H
@@ -11567,9 +11567,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vs_time.h linux-2.6.32.59-vs
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/Kbuild linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/Kbuild
---- linux-2.6.32.59/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/Kbuild 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/Kbuild linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/Kbuild
+--- linux-2.6.32.60/include/linux/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/Kbuild 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,8 @@
+
+unifdef-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -11579,9 +11579,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/Kbuild linux-2.6.32.
+
+unifdef-y += switch.h network.h monitor.h inode.h device.h
+
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/base.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/base.h
---- linux-2.6.32.59/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/base.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/base.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/base.h
+--- linux-2.6.32.60/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/base.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,170 @@
+#ifndef _VX_BASE_H
+#define _VX_BASE_H
@@ -11753,9 +11753,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/base.h linux-2.6.32.
+#define nx_info_state(n, m) (__nx_state(n) & (m))
+
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct.h
---- linux-2.6.32.59/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cacct.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct.h
+--- linux-2.6.32.60/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_CACCT_H
+#define _VX_CACCT_H
@@ -11772,9 +11772,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct.h linux-2.6.32
+};
+
+#endif /* _VX_CACCT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h
---- linux-2.6.32.59/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cacct_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,23 @@
+#ifndef _VX_CACCT_CMD_H
+#define _VX_CACCT_CMD_H
@@ -11799,9 +11799,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_cmd.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h
---- linux-2.6.32.59/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cacct_def.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h
+--- linux-2.6.32.60/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_def.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,43 @@
+#ifndef _VX_CACCT_DEF_H
+#define _VX_CACCT_DEF_H
@@ -11846,9 +11846,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_def.h linux-2.
+#endif
+
+#endif /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_int.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h
---- linux-2.6.32.59/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cacct_int.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h
+--- linux-2.6.32.60/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cacct_int.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _VX_CACCT_INT_H
+#define _VX_CACCT_INT_H
@@ -11871,9 +11871,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cacct_int.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/check.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/check.h
---- linux-2.6.32.59/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/check.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/check.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/check.h
+--- linux-2.6.32.60/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/check.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,89 @@
+#ifndef _VS_CHECK_H
+#define _VS_CHECK_H
@@ -11964,9 +11964,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/check.h linux-2.6.32
+#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1)
+
+#endif
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context.h
---- linux-2.6.32.59/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/context.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/context.h
+--- linux-2.6.32.60/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/context.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,184 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -12152,9 +12152,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context.h linux-2.6.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h
---- linux-2.6.32.59/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/context_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/context_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,145 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -12301,9 +12301,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/context_cmd.h linux-
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h
---- linux-2.6.32.59/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cvirt.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h
+--- linux-2.6.32.60/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -12325,9 +12325,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt.h linux-2.6.32
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.32.59/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cvirt_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -12382,9 +12382,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_cmd.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h
---- linux-2.6.32.59/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/cvirt_def.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h
+--- linux-2.6.32.60/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/cvirt_def.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,80 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -12466,9 +12466,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/cvirt_def.h linux-2.
+#endif
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug.h
---- linux-2.6.32.59/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/debug.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/debug.h
+--- linux-2.6.32.60/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/debug.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,127 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -12597,9 +12597,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug.h linux-2.6.32
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h
---- linux-2.6.32.59/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/debug_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/debug_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -12659,9 +12659,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/debug_cmd.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device.h
---- linux-2.6.32.59/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/device.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device.h
+--- linux-2.6.32.60/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_DEVICE_H
+#define _VX_DEVICE_H
@@ -12678,9 +12678,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device.h linux-2.6.3
+#else /* _VX_DEVICE_H */
+#warning duplicate inclusion
+#endif /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h
---- linux-2.6.32.59/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/device_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,44 @@
+#ifndef _VX_DEVICE_CMD_H
+#define _VX_DEVICE_CMD_H
@@ -12726,9 +12726,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_cmd.h linux-2
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_def.h
---- linux-2.6.32.59/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/device_def.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/device_def.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device_def.h
+--- linux-2.6.32.60/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/device_def.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_DEVICE_DEF_H
+#define _VX_DEVICE_DEF_H
@@ -12747,9 +12747,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/device_def.h linux-2
+};
+
+#endif /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h
---- linux-2.6.32.59/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/dlimit.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h
+--- linux-2.6.32.60/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/dlimit.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -12805,9 +12805,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit.h linux-2.6.3
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.32.59/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/dlimit_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/dlimit_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,109 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -12918,9 +12918,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/dlimit_cmd.h linux-2
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/global.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/global.h
---- linux-2.6.32.59/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/global.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/global.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/global.h
+--- linux-2.6.32.60/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/global.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _VX_GLOBAL_H
+#define _VX_GLOBAL_H
@@ -12941,9 +12941,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/global.h linux-2.6.3
+
+
+#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/history.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/history.h
---- linux-2.6.32.59/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/history.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/history.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/history.h
+--- linux-2.6.32.60/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/history.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,197 @@
+#ifndef _VX_HISTORY_H
+#define _VX_HISTORY_H
@@ -13142,9 +13142,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/history.h linux-2.6.
+#endif /* CONFIG_VSERVER_HISTORY */
+
+#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode.h
---- linux-2.6.32.59/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/inode.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/inode.h
+--- linux-2.6.32.60/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/inode.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -13185,9 +13185,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode.h linux-2.6.32
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h
---- linux-2.6.32.59/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/inode_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/inode_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,59 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -13248,9 +13248,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/inode_cmd.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit.h
---- linux-2.6.32.59/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/limit.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit.h
+--- linux-2.6.32.60/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -13323,9 +13323,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit.h linux-2.6.32
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h
---- linux-2.6.32.59/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/limit_cmd.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h
+--- linux-2.6.32.60/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_cmd.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,71 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -13398,9 +13398,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_cmd.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_def.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h
---- linux-2.6.32.59/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/limit_def.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h
+--- linux-2.6.32.60/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_def.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,47 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -13449,9 +13449,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_def.h linux-2.
+#endif
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_int.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h
---- linux-2.6.32.59/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/limit_int.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h
+--- linux-2.6.32.60/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/limit_int.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,198 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -13651,9 +13651,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/limit_int.h linux-2.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/monitor.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/monitor.h
---- linux-2.6.32.59/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/monitor.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/monitor.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/monitor.h
+--- linux-2.6.32.60/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/monitor.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,96 @@
+#ifndef _VX_MONITOR_H
+#define _VX_MONITOR_H
@@ -13751,9 +13751,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/monitor.h linux-2.6.
+
+
+#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/network.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network.h
---- linux-2.6.32.59/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network.h 2011-06-10 13:03:02.000000000 +0200
+diff -NurpP --minimal linux-2.6.32.60/include/linux/vserver/network.h linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/network.h
+--- linux-2.6.32.60/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.32.60-vs2.3.0.36.29.9/include/linux/vserver/network.h 2011-06-10 13:03:02.000000000 +0200
@@ -0,0 +1,146 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -13901,9 +13901,9 @@ diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/network.h linux-2.6.
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.32.59/include/linux/vserver/network_cmd.h linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network_cmd.h
---- linux-2.6.32.59/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32.59-vs2.3.0.36.29.9/include/linux/vserver/network_cmd.h 2011-06-10 13:03:02.000000000 +0200
<Skipped 2179 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/aa0fbfe3b87ec9bee3aad4aeedb90b53d3c20e3d
More information about the pld-cvs-commit
mailing list