[kernel] r7701 - in dists/trunk/linux-2.6/debian: .
patches/features/all/vserver patches/series
Bastian Blank
waldi at alioth.debian.org
Mon Nov 6 12:17:43 UTC 2006
Author: waldi
Date: Mon Nov 6 13:17:42 2006
New Revision: 7701
Added:
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc5.patch
- copied, changed from r7680, dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch
dists/trunk/linux-2.6/debian/patches/series/5-extra
Removed:
dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/4-extra
Log:
Update vserver patch to 2.0.2.2-rc5.
* debian/changelog: Update.
* debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch: Remove.
* debian/patches/features/all/vserver/vs2.0.2.2-rc5.patch: Add.
* debian/patches/series/4-extra, debian/patches/series/5-extra: Update.
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Nov 6 13:17:42 2006
@@ -9,7 +9,10 @@
[ Thiemo Seufer ]
* Fix build failure of hugetlbfs (closes: #397139).
- -- Thiemo Seufer <ths at debian.org> Sun, 05 Nov 2006 21:29:05 +0000
+ [ Bastian Blank ]
+ * Update vserver patch to 2.0.2.2-rc5.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 6 Nov 2006 13:15:37 +0100
linux-2.6 (2.6.18-4) unstable; urgency=low
Copied: dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc5.patch (from r7680, dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch)
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc4.patch (original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/vs2.0.2.2-rc5.patch Mon Nov 6 13:17:42 2006
@@ -1,6 +1,7 @@
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/Kconfig
---- linux-2.6.18.1/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/Makefile linux-2.6.18.2-vs2.0.2.2-rc5/Makefile
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/Kconfig
+--- linux-2.6.18.2/arch/alpha/Kconfig 2006-06-18 04:51:38 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/Kconfig 2006-09-20 17:01:44 +0200
@@ -632,6 +632,8 @@ source "arch/alpha/oprofile/Kconfig"
source "arch/alpha/Kconfig.debug"
@@ -10,9 +11,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/entry.S
---- linux-2.6.18.1/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/entry.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/entry.S
+--- linux-2.6.18.2/arch/alpha/kernel/entry.S 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/entry.S 2006-09-20 17:01:44 +0200
@@ -873,24 +873,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +46,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/irq.c
---- linux-2.6.18.1/arch/alpha/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/irq.c 2006-10-25 03:42:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/irq.c
+--- linux-2.6.18.2/arch/alpha/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/irq.c 2006-11-06 05:08:58 +0100
@@ -26,6 +26,7 @@
#include <linux/seq_file.h>
#include <linux/profile.h>
@@ -73,9 +74,9 @@
+ __leave_vx_admin(&vxis);
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/osf_sys.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/osf_sys.c
---- linux-2.6.18.1/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/osf_sys.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.18.2/arch/alpha/kernel/osf_sys.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/osf_sys.c 2006-09-20 20:11:48 +0200
@@ -38,6 +38,7 @@
#include <linux/uio.h>
#include <linux/vfs.h>
@@ -175,9 +176,9 @@
len = strlen(res)+1;
if (len > count)
len = count;
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/ptrace.c
---- linux-2.6.18.1/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/ptrace.c
+--- linux-2.6.18.2/arch/alpha/kernel/ptrace.c 2006-04-09 13:49:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -283,6 +283,11 @@ do_sys_ptrace(long request, long pid, lo
goto out_notsk;
}
@@ -190,9 +191,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out;
-diff -NurpP --minimal linux-2.6.18.1/arch/alpha/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/systbls.S
---- linux-2.6.18.1/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/systbls.S
+--- linux-2.6.18.2/arch/alpha/kernel/systbls.S 2005-08-29 22:24:49 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/kernel/systbls.S 2006-09-20 17:01:44 +0200
@@ -447,7 +447,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -202,9 +203,9 @@
.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.18.1/arch/alpha/mm/init.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/mm/init.c
---- linux-2.6.18.1/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/alpha/mm/init.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/mm/init.c
+--- linux-2.6.18.2/arch/alpha/mm/init.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/alpha/mm/init.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/init.h>
#include <linux/bootmem.h> /* max_low_pfn */
@@ -213,9 +214,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.1/arch/arm/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/Kconfig
---- linux-2.6.18.1/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm/Kconfig
+--- linux-2.6.18.2/arch/arm/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm/Kconfig 2006-09-20 17:01:44 +0200
@@ -907,6 +907,8 @@ source "arch/arm/oprofile/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -225,9 +226,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/arm/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/kernel/calls.S
---- linux-2.6.18.1/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm/kernel/calls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm/kernel/calls.S
+--- linux-2.6.18.2/arch/arm/kernel/calls.S 2006-02-18 14:39:40 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm/kernel/calls.S 2006-09-20 17:01:44 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -237,9 +238,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/Kconfig
---- linux-2.6.18.1/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/Kconfig
+--- linux-2.6.18.2/arch/arm26/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/Kconfig 2006-09-20 17:01:44 +0200
@@ -234,6 +234,8 @@ source "drivers/usb/Kconfig"
source "arch/arm26/Kconfig.debug"
@@ -249,9 +250,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/calls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/calls.S
---- linux-2.6.18.1/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/calls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/kernel/calls.S
+--- linux-2.6.18.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/kernel/calls.S 2006-09-20 17:01:44 +0200
@@ -257,6 +257,11 @@ __syscall_start:
.long sys_lremovexattr
.long sys_fremovexattr
@@ -264,9 +265,9 @@
__syscall_end:
.rept NR_syscalls - (__syscall_end - __syscall_start) / 4
-diff -NurpP --minimal linux-2.6.18.1/arch/arm26/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/traps.c
---- linux-2.6.18.1/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/arm26/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/kernel/traps.c
+--- linux-2.6.18.2/arch/arm26/kernel/traps.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/arm26/kernel/traps.c 2006-09-20 17:01:44 +0200
@@ -185,8 +185,9 @@ NORET_TYPE void die(const char *str, str
printk("Internal error: %s: %x\n", str, err);
printk("CPU: %d\n", smp_processor_id());
@@ -279,9 +280,9 @@
if (!user_mode(regs) || in_interrupt()) {
__dump_stack(tsk, (unsigned long)(regs + 1));
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/Kconfig
---- linux-2.6.18.1/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/cris/Kconfig
+--- linux-2.6.18.2/arch/cris/Kconfig 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/cris/Kconfig 2006-09-20 17:01:44 +0200
@@ -185,6 +185,8 @@ source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -291,9 +292,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/cris/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/kernel/irq.c
---- linux-2.6.18.1/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/cris/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/cris/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/cris/kernel/irq.c
+--- linux-2.6.18.2/arch/cris/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/cris/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -35,6 +35,7 @@
#include <linux/seq_file.h>
#include <linux/errno.h>
@@ -320,9 +321,9 @@
irq_exit();
}
-diff -NurpP --minimal linux-2.6.18.1/arch/frv/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/frv/kernel/irq.c
---- linux-2.6.18.1/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/frv/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/frv/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/frv/kernel/irq.c
+--- linux-2.6.18.2/arch/frv/kernel/irq.c 2006-09-20 16:57:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/frv/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -32,6 +32,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@ -350,9 +351,9 @@
__clr_MASK(level);
-diff -NurpP --minimal linux-2.6.18.1/arch/h8300/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/h8300/Kconfig
---- linux-2.6.18.1/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/h8300/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/h8300/Kconfig
+--- linux-2.6.18.2/arch/h8300/Kconfig 2006-06-18 04:51:49 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/h8300/Kconfig 2006-09-20 17:01:44 +0200
@@ -199,6 +199,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -362,9 +363,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/Kconfig
---- linux-2.6.18.1/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/Kconfig
+--- linux-2.6.18.2/arch/i386/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/Kconfig 2006-09-20 17:01:44 +0200
@@ -1142,6 +1142,8 @@ endmenu
source "arch/i386/Kconfig.debug"
@@ -374,9 +375,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/irq.c
---- linux-2.6.18.1/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/irq.c
+--- linux-2.6.18.2/arch/i386/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -18,6 +18,7 @@
#include <linux/notifier.h>
#include <linux/cpu.h>
@@ -410,9 +411,9 @@
irq_exit();
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sys_i386.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sys_i386.c
---- linux-2.6.18.1/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sys_i386.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/sys_i386.c
+--- linux-2.6.18.2/arch/i386/kernel/sys_i386.c 2006-06-18 04:51:53 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/sys_i386.c 2006-09-20 17:01:44 +0200
@@ -19,6 +19,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -460,9 +461,9 @@
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/syscall_table.S
---- linux-2.6.18.1/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/syscall_table.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/syscall_table.S
+--- linux-2.6.18.2/arch/i386/kernel/syscall_table.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
@@ -272,7 +272,7 @@ ENTRY(sys_call_table)
.long sys_tgkill /* 270 */
.long sys_utimes
@@ -472,9 +473,9 @@
.long sys_mbind
.long sys_get_mempolicy
.long sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/sysenter.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sysenter.c
---- linux-2.6.18.1/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/sysenter.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/sysenter.c
+--- linux-2.6.18.2/arch/i386/kernel/sysenter.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/sysenter.c 2006-09-20 21:46:26 +0200
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
@@ -492,9 +493,9 @@
up_fail:
up_write(&mm->mmap_sem);
return ret;
-diff -NurpP --minimal linux-2.6.18.1/arch/i386/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/traps.c
---- linux-2.6.18.1/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/i386/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/traps.c
+--- linux-2.6.18.2/arch/i386/kernel/traps.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/i386/kernel/traps.c 2006-09-20 20:10:14 +0200
@@ -53,6 +53,7 @@
#include <asm/kdebug.h>
@@ -535,9 +536,9 @@
/* Executive summary in case the oops scrolled away */
esp = (unsigned long) (®s->esp);
savesegment(ss, ss);
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/Kconfig
---- linux-2.6.18.1/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/Kconfig
+--- linux-2.6.18.2/arch/ia64/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/Kconfig 2006-09-20 17:01:44 +0200
@@ -525,6 +525,8 @@ endmenu
source "arch/ia64/Kconfig.debug"
@@ -547,9 +548,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.18.1/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/ia32/binfmt_elf32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.18.2/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/ia32/binfmt_elf32.c 2006-09-20 17:01:44 +0200
@@ -238,7 +238,8 @@ ia32_setup_arg_pages (struct linux_binpr
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -560,9 +561,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.18.1/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/ia32/ia32_entry.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.18.2/arch/ia64/ia32/ia32_entry.S 2006-06-18 04:51:55 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/ia32/ia32_entry.S 2006-09-20 17:01:44 +0200
@@ -483,7 +483,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -572,9 +573,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/entry.S
---- linux-2.6.18.1/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/kernel/entry.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/entry.S
+--- linux-2.6.18.2/arch/ia64/kernel/entry.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/entry.S 2006-09-20 17:01:44 +0200
@@ -1576,7 +1576,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -584,9 +585,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/kernel/perfmon.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/perfmon.c
---- linux-2.6.18.1/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/kernel/perfmon.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/perfmon.c
+--- linux-2.6.18.2/arch/ia64/kernel/perfmon.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/perfmon.c 2006-10-18 01:19:40 +0200
@@ -40,6 +40,7 @@
#include <linux/capability.h>
#include <linux/rcupdate.h>
@@ -604,9 +605,9 @@
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.18.1/arch/ia64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/ptrace.c
---- linux-2.6.18.1/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/ptrace.c
+--- linux-2.6.18.2/arch/ia64/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/kernel/ptrace.c 2006-10-18 01:19:40 +0200
@@ -1442,6 +1442,9 @@ sys_ptrace (long request, pid_t pid, uns
read_unlock(&tasklist_lock);
if (!child)
@@ -617,9 +618,9 @@
ret = -EPERM;
if (pid == 1) /* no messing around with init! */
goto out_tsk;
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/mm/fault.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/mm/fault.c
---- linux-2.6.18.1/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/mm/fault.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/mm/fault.c
+--- linux-2.6.18.2/arch/ia64/mm/fault.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/mm/fault.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
@@ -628,9 +629,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/sn/kernel/xpc_main.c
---- linux-2.6.18.1/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ia64/sn/kernel/xpc_main.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/sn/kernel/xpc_main.c
+--- linux-2.6.18.2/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ia64/sn/kernel/xpc_main.c 2006-09-20 17:01:44 +0200
@@ -108,6 +108,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] =
0644,
NULL,
@@ -655,9 +656,9 @@
&sysctl_intvec,
NULL,
&xpc_disengage_request_min_timelimit,
-diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/irq.c
---- linux-2.6.18.1/arch/m32r/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/m32r/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/m32r/kernel/irq.c
+--- linux-2.6.18.2/arch/m32r/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/m32r/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -20,6 +20,7 @@
#include <linux/interrupt.h>
#include <linux/seq_file.h>
@@ -683,9 +684,9 @@
irq_exit();
return 1;
-diff -NurpP --minimal linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/sys_m32r.c
---- linux-2.6.18.1/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/m32r/kernel/sys_m32r.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/m32r/kernel/sys_m32r.c
+--- linux-2.6.18.2/arch/m32r/kernel/sys_m32r.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/m32r/kernel/sys_m32r.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -703,9 +704,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/m68k/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/Kconfig
---- linux-2.6.18.1/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/m68k/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68k/Kconfig
+--- linux-2.6.18.2/arch/m68k/Kconfig 2006-06-18 04:51:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68k/Kconfig 2006-09-20 17:01:44 +0200
@@ -654,6 +654,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -715,9 +716,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/m68k/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/kernel/ptrace.c
---- linux-2.6.18.1/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/m68k/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68k/kernel/ptrace.c
+--- linux-2.6.18.2/arch/m68k/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68k/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -279,6 +279,8 @@ long arch_ptrace(struct task_struct *chi
ret = ptrace_request(child, request, addr, data);
break;
@@ -727,9 +728,9 @@
return ret;
out_eio:
-diff -NurpP --minimal linux-2.6.18.1/arch/m68knommu/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68knommu/Kconfig
---- linux-2.6.18.1/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/m68knommu/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68knommu/Kconfig
+--- linux-2.6.18.2/arch/m68knommu/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/m68knommu/Kconfig 2006-09-20 17:01:44 +0200
@@ -663,6 +663,8 @@ source "fs/Kconfig"
source "arch/m68knommu/Kconfig.debug"
@@ -739,9 +740,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/Kconfig
---- linux-2.6.18.1/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/Kconfig
+--- linux-2.6.18.2/arch/mips/Kconfig 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/Kconfig 2006-09-20 17:01:44 +0200
@@ -2057,6 +2057,8 @@ source "arch/mips/oprofile/Kconfig"
source "arch/mips/Kconfig.debug"
@@ -751,9 +752,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/irq.c
---- linux-2.6.18.1/arch/mips/kernel/irq.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/irq.c
+--- linux-2.6.18.2/arch/mips/kernel/irq.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -21,6 +21,7 @@
#include <linux/sched.h>
#include <linux/seq_file.h>
@@ -777,9 +778,9 @@
irq_exit();
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/linux32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/linux32.c
---- linux-2.6.18.1/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/linux32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/linux32.c
+--- linux-2.6.18.2/arch/mips/kernel/linux32.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/linux32.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/security.h>
#include <linux/compat.h>
@@ -797,9 +798,9 @@
ret = -EFAULT;
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/ptrace.c
---- linux-2.6.18.1/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/ptrace.c 2006-10-29 03:01:48 +0100
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/ptrace.c
+--- linux-2.6.18.2/arch/mips/kernel/ptrace.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/ptrace.c 2006-11-06 05:10:07 +0100
@@ -171,6 +171,9 @@ long arch_ptrace(struct task_struct *chi
{
int ret;
@@ -810,9 +811,9 @@
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.18.1/arch/mips/kernel/scall32-o32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall32-o32.S
---- linux-2.6.18.1/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall32-o32.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall32-o32.S
+--- linux-2.6.18.2/arch/mips/kernel/scall32-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall32-o32.S 2006-09-20 17:01:44 +0200
@@ -630,7 +630,7 @@ einval: li v0, -EINVAL
sys sys_mq_timedreceive 5
sys sys_mq_notify 2 /* 4275 */
@@ -822,9 +823,9 @@
sys sys_waitid 5
sys sys_ni_syscall 0 /* available, was setaltroot */
sys sys_add_key 5 /* 4280 */
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-64.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-64.S
---- linux-2.6.18.1/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall64-64.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-64.S
+--- linux-2.6.18.2/arch/mips/kernel/scall64-64.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-64.S 2006-09-20 17:01:44 +0200
@@ -434,7 +434,7 @@ sys_call_table:
PTR sys_mq_timedreceive
PTR sys_mq_notify
@@ -834,9 +835,9 @@
PTR sys_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-n32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-n32.S
---- linux-2.6.18.1/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall64-n32.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-n32.S
+--- linux-2.6.18.2/arch/mips/kernel/scall64-n32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-n32.S 2006-09-20 17:01:44 +0200
@@ -360,7 +360,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify
@@ -846,9 +847,9 @@
PTR sysn32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/scall64-o32.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-o32.S
---- linux-2.6.18.1/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/scall64-o32.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-o32.S
+--- linux-2.6.18.2/arch/mips/kernel/scall64-o32.S 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/scall64-o32.S 2006-09-20 17:01:44 +0200
@@ -482,7 +482,7 @@ sys_call_table:
PTR compat_sys_mq_timedreceive
PTR compat_sys_mq_notify /* 4275 */
@@ -858,9 +859,9 @@
PTR sys32_waitid
PTR sys_ni_syscall /* available, was setaltroot */
PTR sys_add_key /* 4280 */
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/syscall.c
---- linux-2.6.18.1/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/syscall.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/syscall.c
+--- linux-2.6.18.2/arch/mips/kernel/syscall.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/syscall.c 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/compiler.h>
@@ -907,9 +908,9 @@
error = __put_user(0,name->machine+__OLD_UTS_LEN);
error = error ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.18.1/arch/mips/kernel/sysirix.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/sysirix.c
---- linux-2.6.18.1/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/mips/kernel/sysirix.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/sysirix.c
+--- linux-2.6.18.2/arch/mips/kernel/sysirix.c 2006-09-20 16:57:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/mips/kernel/sysirix.c 2006-09-20 20:02:24 +0200
@@ -32,6 +32,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -944,9 +945,9 @@
return -EFAULT;
}
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.1/arch/parisc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/Kconfig
---- linux-2.6.18.1/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/parisc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/Kconfig
+--- linux-2.6.18.2/arch/parisc/Kconfig 2006-09-20 16:58:00 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/Kconfig 2006-09-20 17:01:44 +0200
@@ -257,6 +257,8 @@ source "arch/parisc/oprofile/Kconfig"
source "arch/parisc/Kconfig.debug"
@@ -956,9 +957,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/hpux/sys_hpux.c
---- linux-2.6.18.1/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/parisc/hpux/sys_hpux.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/hpux/sys_hpux.c
+--- linux-2.6.18.2/arch/parisc/hpux/sys_hpux.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/hpux/sys_hpux.c 2006-09-20 17:01:44 +0200
@@ -33,6 +33,7 @@
#include <linux/utsname.h>
#include <linux/vfs.h>
@@ -1026,9 +1027,9 @@
goto done;
err = 0;
done:
-diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/sys_parisc32.c
---- linux-2.6.18.1/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/parisc/kernel/sys_parisc32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/kernel/sys_parisc32.c
+--- linux-2.6.18.2/arch/parisc/kernel/sys_parisc32.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/kernel/sys_parisc32.c 2006-09-20 17:01:44 +0200
@@ -598,6 +598,7 @@ asmlinkage int sys32_sysinfo(struct sysi
do {
@@ -1037,9 +1038,9 @@
val.uptime = jiffies / HZ;
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.18.1/arch/parisc/kernel/syscall_table.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/syscall_table.S
---- linux-2.6.18.1/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/parisc/kernel/syscall_table.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/kernel/syscall_table.S
+--- linux-2.6.18.2/arch/parisc/kernel/syscall_table.S 2006-06-18 04:52:15 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/parisc/kernel/syscall_table.S 2006-09-20 17:01:44 +0200
@@ -368,7 +368,7 @@
ENTRY_COMP(mbind) /* 260 */
ENTRY_COMP(get_mempolicy)
@@ -1049,10 +1050,10 @@
ENTRY_SAME(add_key)
ENTRY_SAME(request_key) /* 265 */
ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/Kconfig
---- linux-2.6.18.1/arch/powerpc/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/Kconfig 2006-09-20 17:01:44 +0200
-@@ -1069,6 +1069,8 @@ endmenu
+diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/Kconfig
+--- linux-2.6.18.2/arch/powerpc/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/Kconfig 2006-11-06 04:47:17 +0100
+@@ -1078,6 +1078,8 @@ endmenu
source "arch/powerpc/Kconfig.debug"
@@ -1061,9 +1062,9 @@
source "security/Kconfig"
config KEYS_COMPAT
-diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/irq.c
---- linux-2.6.18.1/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/irq.c
+--- linux-2.6.18.2/arch/powerpc/kernel/irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -52,6 +52,7 @@
#include <linux/radix-tree.h>
#include <linux/mutex.h>
@@ -1104,9 +1105,9 @@
}
#endif
}
-diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/process.c
---- linux-2.6.18.1/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/process.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/process.c
+--- linux-2.6.18.2/arch/powerpc/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/process.c 2006-09-20 17:01:44 +0200
@@ -431,8 +431,9 @@ void show_regs(struct pt_regs * regs)
trap = TRAP(regs);
if (trap == 0x300 || trap == 0x600)
@@ -1119,9 +1120,9 @@
#ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id());
-diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/syscalls.c
---- linux-2.6.18.1/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/syscalls.c
+--- linux-2.6.18.2/arch/powerpc/kernel/syscalls.c 2006-06-18 04:52:17 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/syscalls.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/file.h>
#include <linux/init.h>
@@ -1181,9 +1182,9 @@
error |= override_machine(name->machine);
up_read(&uts_sem);
-diff -NurpP --minimal linux-2.6.18.1/arch/powerpc/kernel/vdso.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/vdso.c
---- linux-2.6.18.1/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/powerpc/kernel/vdso.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/vdso.c
+--- linux-2.6.18.2/arch/powerpc/kernel/vdso.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/powerpc/kernel/vdso.c 2006-09-20 19:58:24 +0200
@@ -22,6 +22,7 @@
#include <linux/elf.h>
#include <linux/security.h>
@@ -1201,9 +1202,9 @@
up_write(&mm->mmap_sem);
return 0;
-diff -NurpP --minimal linux-2.6.18.1/arch/ppc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/ppc/Kconfig
---- linux-2.6.18.1/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/ppc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/ppc/Kconfig
+--- linux-2.6.18.2/arch/ppc/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/ppc/Kconfig 2006-09-20 17:01:44 +0200
@@ -1418,6 +1418,8 @@ source "arch/powerpc/oprofile/Kconfig"
source "arch/ppc/Kconfig.debug"
@@ -1213,10 +1214,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/s390/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/Kconfig
---- linux-2.6.18.1/arch/s390/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/Kconfig 2006-09-20 17:01:44 +0200
-@@ -491,6 +491,8 @@ source "arch/s390/oprofile/Kconfig"
+diff -NurpP --minimal linux-2.6.18.2/arch/s390/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/Kconfig
+--- linux-2.6.18.2/arch/s390/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/Kconfig 2006-11-06 04:47:17 +0100
+@@ -495,6 +495,8 @@ source "arch/s390/oprofile/Kconfig"
source "arch/s390/Kconfig.debug"
@@ -1225,9 +1226,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/process.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/process.c
---- linux-2.6.18.1/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/process.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/process.c
+--- linux-2.6.18.2/arch/s390/kernel/process.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/process.c 2006-09-20 17:01:44 +0200
@@ -165,9 +165,9 @@ void show_regs(struct pt_regs *regs)
struct task_struct *tsk = current;
@@ -1241,9 +1242,9 @@
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
-diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/ptrace.c
---- linux-2.6.18.1/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/ptrace.c
+--- linux-2.6.18.2/arch/s390/kernel/ptrace.c 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -723,7 +723,13 @@ sys_ptrace(long request, long pid, long
goto out;
}
@@ -1258,9 +1259,9 @@
put_task_struct(child);
out:
unlock_kernel();
-diff -NurpP --minimal linux-2.6.18.1/arch/s390/kernel/syscalls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/syscalls.S
---- linux-2.6.18.1/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/s390/kernel/syscalls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/syscalls.S
+--- linux-2.6.18.2/arch/s390/kernel/syscalls.S 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/s390/kernel/syscalls.S 2006-09-20 17:01:44 +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)
@@ -1270,9 +1271,9 @@
SYSCALL(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.18.1/arch/sh/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/Kconfig
---- linux-2.6.18.1/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/Kconfig
+--- linux-2.6.18.2/arch/sh/Kconfig 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/Kconfig 2006-09-20 17:01:44 +0200
@@ -646,6 +646,8 @@ source "arch/sh/oprofile/Kconfig"
source "arch/sh/Kconfig.debug"
@@ -1282,9 +1283,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/irq.c
---- linux-2.6.18.1/arch/sh/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/irq.c
+--- linux-2.6.18.2/arch/sh/kernel/irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -12,6 +12,7 @@
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
@@ -1311,9 +1312,9 @@
irq_exit();
return 1;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/kgdb_stub.c
---- linux-2.6.18.1/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/kgdb_stub.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/kgdb_stub.c
+--- linux-2.6.18.2/arch/sh/kernel/kgdb_stub.c 2004-08-14 12:54:51 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/kgdb_stub.c 2006-09-20 17:01:44 +0200
@@ -412,7 +412,7 @@ static struct task_struct *get_thread(in
if (pid == PID_MAX) pid = 0;
@@ -1323,9 +1324,9 @@
if (thread)
return thread;
-diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/setup.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/setup.c
---- linux-2.6.18.1/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/setup.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/setup.c
+--- linux-2.6.18.2/arch/sh/kernel/setup.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/setup.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/cpu.h>
@@ -1343,9 +1344,9 @@
seq_printf(m, "cpu type\t: %s\n", get_cpu_subtype());
show_cpuflags(m);
-diff -NurpP --minimal linux-2.6.18.1/arch/sh/kernel/sys_sh.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/sys_sh.c
---- linux-2.6.18.1/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh/kernel/sys_sh.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/sys_sh.c
+--- linux-2.6.18.2/arch/sh/kernel/sys_sh.c 2005-08-29 22:24:55 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh/kernel/sys_sh.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -1363,9 +1364,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/irq.c
---- linux-2.6.18.1/arch/sh64/kernel/irq.c 2006-09-20 16:58:01 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh64/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh64/kernel/irq.c
+--- linux-2.6.18.2/arch/sh64/kernel/irq.c 2006-09-20 16:58:01 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh64/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -37,6 +37,7 @@
#include <asm/delay.h>
#include <asm/irq.h>
@@ -1386,9 +1387,9 @@
} else {
printk("unexpected IRQ trap at vector %03lx\n", vector_num);
}
-diff -NurpP --minimal linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/sys_sh64.c
---- linux-2.6.18.1/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sh64/kernel/sys_sh64.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh64/kernel/sys_sh64.c
+--- linux-2.6.18.2/arch/sh64/kernel/sys_sh64.c 2005-06-22 02:37:59 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sh64/kernel/sys_sh64.c 2006-09-20 17:01:44 +0200
@@ -29,6 +29,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
@@ -1406,9 +1407,9 @@
up_read(&uts_sem);
return err?-EFAULT:0;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/Kconfig
---- linux-2.6.18.1/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/Kconfig
+--- linux-2.6.18.2/arch/sparc/Kconfig 2006-06-18 04:52:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/Kconfig 2006-09-20 17:01:44 +0200
@@ -291,6 +291,8 @@ source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
@@ -1418,9 +1419,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/ptrace.c
---- linux-2.6.18.1/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/ptrace.c
+--- linux-2.6.18.2/arch/sparc/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -299,6 +299,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
@@ -1432,9 +1433,9 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sparc.c
---- linux-2.6.18.1/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/sys_sparc.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/sys_sparc.c
+--- linux-2.6.18.2/arch/sparc/kernel/sys_sparc.c 2006-09-20 16:58:04 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/sys_sparc.c 2006-09-20 19:57:58 +0200
@@ -21,6 +21,7 @@
#include <linux/utsname.h>
#include <linux/smp.h>
@@ -1459,9 +1460,9 @@
err = 0;
out:
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sunos.c
---- linux-2.6.18.1/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/sys_sunos.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/sys_sunos.c
+--- linux-2.6.18.2/arch/sparc/kernel/sys_sunos.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/sys_sunos.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@ -1492,9 +1493,9 @@
}
up_read(&uts_sem);
return ret ? -EFAULT : 0;
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/systbls.S
---- linux-2.6.18.1/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/systbls.S
+--- linux-2.6.18.2/arch/sparc/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc/kernel/systbls.S 2006-09-20 17:01:44 +0200
@@ -71,7 +71,7 @@ sys_call_table:
/*250*/ .long sparc_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
@@ -1504,9 +1505,9 @@
/*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.18.1/arch/sparc64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/Kconfig
---- linux-2.6.18.1/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/Kconfig
+--- linux-2.6.18.2/arch/sparc64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/Kconfig 2006-09-20 17:01:44 +0200
@@ -431,6 +431,8 @@ endmenu
source "arch/sparc64/Kconfig.debug"
@@ -1516,9 +1517,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.18.1/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/binfmt_aout32.c
+--- linux-2.6.18.2/arch/sparc64/kernel/binfmt_aout32.c 2006-06-18 04:52:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/binfmt_aout32.c 2006-09-20 17:01:44 +0200
@@ -27,6 +27,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1527,9 +1528,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/ptrace.c
---- linux-2.6.18.1/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/ptrace.c
+--- linux-2.6.18.2/arch/sparc64/kernel/ptrace.c 2006-06-18 04:52:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -212,6 +212,10 @@ asmlinkage void do_ptrace(struct pt_regs
pt_error_return(regs, -ret);
goto out;
@@ -1541,9 +1542,9 @@
if ((current->personality == PER_SUNOS && request == PTRACE_SUNATTACH)
|| (current->personality != PER_SUNOS && request == PTRACE_ATTACH)) {
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sparc.c
---- linux-2.6.18.1/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/sys_sparc.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/sys_sparc.c
+--- linux-2.6.18.2/arch/sparc64/kernel/sys_sparc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/sys_sparc.c 2006-09-20 19:57:05 +0200
@@ -25,6 +25,7 @@
#include <linux/ipc.h>
#include <linux/personality.h>
@@ -1568,9 +1569,9 @@
err = 0;
out:
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sunos32.c
---- linux-2.6.18.1/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/sys_sunos32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/sys_sunos32.c
+--- linux-2.6.18.2/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/sys_sunos32.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/smp.h>
#include <linux/smp_lock.h>
@@ -1605,9 +1606,9 @@
sizeof(name->mach) - 1);
up_read(&uts_sem);
return (ret ? -EFAULT : 0);
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/kernel/systbls.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/systbls.S
---- linux-2.6.18.1/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/kernel/systbls.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/systbls.S
+--- linux-2.6.18.2/arch/sparc64/kernel/systbls.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/kernel/systbls.S 2006-09-20 17:01:44 +0200
@@ -72,7 +72,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
@@ -1626,9 +1627,9 @@
/*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.18.1/arch/sparc64/solaris/fs.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/fs.c
---- linux-2.6.18.1/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/solaris/fs.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/solaris/fs.c
+--- linux-2.6.18.2/arch/sparc64/solaris/fs.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/solaris/fs.c 2006-09-20 17:01:44 +0200
@@ -363,7 +363,7 @@ static int report_statvfs(struct vfsmoun
int j = strlen (p);
@@ -1647,9 +1648,9 @@
if (mnt->mnt_flags & MNT_NOSUID) i |= 2;
if (!sysv_valid_dev(inode->i_sb->s_dev))
return -EOVERFLOW;
-diff -NurpP --minimal linux-2.6.18.1/arch/sparc64/solaris/misc.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/misc.c
---- linux-2.6.18.1/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/sparc64/solaris/misc.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/solaris/misc.c
+--- linux-2.6.18.2/arch/sparc64/solaris/misc.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/sparc64/solaris/misc.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/timex.h>
#include <linux/major.h>
@@ -1685,9 +1686,9 @@
q < r && *p && *p != '.'; *q++ = *p++);
up_read(&uts_sem);
*q = 0;
-diff -NurpP --minimal linux-2.6.18.1/arch/um/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/Kconfig
---- linux-2.6.18.1/arch/um/Kconfig 2006-10-17 03:21:13 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/Kconfig 2006-10-16 18:56:10 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/um/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/Kconfig
+--- linux-2.6.18.2/arch/um/Kconfig 2006-11-04 19:43:22 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/Kconfig 2006-10-16 18:56:10 +0200
@@ -284,6 +284,8 @@ source "drivers/connector/Kconfig"
source "fs/Kconfig"
@@ -1697,9 +1698,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/irq.c
---- linux-2.6.18.1/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/um/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/kernel/irq.c
+--- linux-2.6.18.2/arch/um/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -19,6 +19,7 @@
#include "linux/seq_file.h"
#include "linux/profile.h"
@@ -1728,9 +1729,9 @@
}
int um_request_irq(unsigned int irq, int fd, int type,
-diff -NurpP --minimal linux-2.6.18.1/arch/um/kernel/syscall.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/syscall.c
---- linux-2.6.18.1/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/um/kernel/syscall.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/kernel/syscall.c
+--- linux-2.6.18.2/arch/um/kernel/syscall.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/kernel/syscall.c 2006-09-21 16:41:49 +0200
@@ -15,6 +15,8 @@
#include "linux/unistd.h"
#include "linux/slab.h"
@@ -1783,9 +1784,9 @@
__OLD_UTS_LEN);
error |= __put_user(0,name->machine+__OLD_UTS_LEN);
-diff -NurpP --minimal linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/sys-x86_64/syscalls.c
---- linux-2.6.18.1/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/um/sys-x86_64/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/sys-x86_64/syscalls.c
+--- linux-2.6.18.2/arch/um/sys-x86_64/syscalls.c 2006-06-18 04:52:42 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/um/sys-x86_64/syscalls.c 2006-09-20 17:01:44 +0200
@@ -9,6 +9,7 @@
#include "linux/shm.h"
#include "linux/utsname.h"
@@ -1803,9 +1804,9 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.18.1/arch/v850/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/Kconfig
---- linux-2.6.18.1/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/v850/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/Kconfig
+--- linux-2.6.18.2/arch/v850/Kconfig 2006-06-18 04:52:42 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/Kconfig 2006-09-20 17:01:44 +0200
@@ -326,6 +326,8 @@ source "drivers/usb/Kconfig"
source "arch/v850/Kconfig.debug"
@@ -1815,9 +1816,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/irq.c
---- linux-2.6.18.1/arch/v850/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/irq.c 2006-10-25 03:42:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/v850/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/kernel/irq.c
+--- linux-2.6.18.2/arch/v850/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/kernel/irq.c 2006-11-06 05:08:58 +0100
@@ -23,6 +23,7 @@
#include <linux/mm.h>
#include <linux/random.h>
@@ -1839,9 +1840,9 @@
irq_exit();
return 1;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/v850/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/ptrace.c
---- linux-2.6.18.1/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/v850/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/kernel/ptrace.c
+--- linux-2.6.18.2/arch/v850/kernel/ptrace.c 2006-04-09 13:49:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/v850/kernel/ptrace.c 2006-09-20 17:01:44 +0200
@@ -117,6 +117,9 @@ long arch_ptrace(struct task_struct *chi
{
int rval;
@@ -1852,9 +1853,9 @@
switch (request) {
unsigned long val, copied;
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/Kconfig
---- linux-2.6.18.1/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/Kconfig
+--- linux-2.6.18.2/arch/x86_64/Kconfig 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/Kconfig 2006-09-20 17:01:44 +0200
@@ -654,6 +654,8 @@ endmenu
source "arch/x86_64/Kconfig.debug"
@@ -1864,9 +1865,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.18.1/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32_aout.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32_aout.c
+--- linux-2.6.18.2/arch/x86_64/ia32/ia32_aout.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32_aout.c 2006-09-20 17:01:44 +0200
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -1875,9 +1876,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.6.18.1/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32_binfmt.c
+--- linux-2.6.18.2/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32_binfmt.c 2006-09-20 17:01:44 +0200
@@ -376,7 +376,8 @@ int ia32_setup_arg_pages(struct linux_bi
kmem_cache_free(vm_area_cachep, mpnt);
return ret;
@@ -1888,9 +1889,9 @@
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32entry.S
---- linux-2.6.18.1/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/ia32entry.S linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32entry.S
+--- linux-2.6.18.2/arch/x86_64/ia32/ia32entry.S 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/ia32entry.S 2006-09-20 17:01:44 +0200
@@ -668,7 +668,7 @@ ia32_sys_call_table:
.quad sys_tgkill /* 270 */
.quad compat_sys_utimes
@@ -1900,9 +1901,9 @@
.quad sys_mbind
.quad compat_sys_get_mempolicy /* 275 */
.quad sys_set_mempolicy
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/sys_ia32.c
---- linux-2.6.18.1/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/sys_ia32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/sys_ia32.c
+--- linux-2.6.18.2/arch/x86_64/ia32/sys_ia32.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/sys_ia32.c 2006-09-20 17:01:44 +0200
@@ -60,6 +60,7 @@
#include <linux/highuid.h>
#include <linux/vmalloc.h>
@@ -1947,9 +1948,9 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/ia32/syscall32.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/syscall32.c
---- linux-2.6.18.1/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/ia32/syscall32.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/syscall32.c
+--- linux-2.6.18.2/arch/x86_64/ia32/syscall32.c 2005-10-28 20:49:18 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/ia32/syscall32.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
@@ -1967,9 +1968,9 @@
up_write(&mm->mmap_sem);
return 0;
}
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/irq.c
---- linux-2.6.18.1/arch/x86_64/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/irq.c
+--- linux-2.6.18.2/arch/x86_64/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -15,6 +15,7 @@
#include <linux/seq_file.h>
#include <linux/module.h>
@@ -1996,9 +1997,9 @@
irq_exit();
return 1;
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/sys_x86_64.c
---- linux-2.6.18.1/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/kernel/sys_x86_64.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/sys_x86_64.c
+--- linux-2.6.18.2/arch/x86_64/kernel/sys_x86_64.c 2006-01-03 17:29:20 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/sys_x86_64.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/file.h>
#include <linux/utsname.h>
@@ -2016,9 +2017,9 @@
up_read(&uts_sem);
if (personality(current->personality) == PER_LINUX32)
err |= copy_to_user(&name->machine, "i686", 5);
-diff -NurpP --minimal linux-2.6.18.1/arch/x86_64/kernel/traps.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/traps.c
---- linux-2.6.18.1/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/x86_64/kernel/traps.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/traps.c
+--- linux-2.6.18.2/arch/x86_64/kernel/traps.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/x86_64/kernel/traps.c 2006-09-20 17:01:44 +0200
@@ -435,8 +435,9 @@ void show_registers(struct pt_regs *regs
printk("CPU %d ", cpu);
@@ -2031,9 +2032,9 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/irq.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/irq.c
---- linux-2.6.18.1/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/irq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/xtensa/kernel/irq.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/xtensa/kernel/irq.c
+--- linux-2.6.18.2/arch/xtensa/kernel/irq.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/xtensa/kernel/irq.c 2006-10-17 02:35:27 +0200
@@ -18,6 +18,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
@@ -2063,9 +2064,9 @@
irq_exit();
return 1;
-diff -NurpP --minimal linux-2.6.18.1/arch/xtensa/kernel/syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/syscalls.c
---- linux-2.6.18.1/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/arch/xtensa/kernel/syscalls.c linux-2.6.18.2-vs2.0.2.2-rc5/arch/xtensa/kernel/syscalls.c
+--- linux-2.6.18.2/arch/xtensa/kernel/syscalls.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/arch/xtensa/kernel/syscalls.c 2006-09-20 17:01:44 +0200
@@ -34,6 +34,7 @@
#include <linux/msg.h>
#include <linux/shm.h>
@@ -2083,9 +2084,9 @@
return 0;
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.18.1/block/cfq-iosched.c linux-2.6.18.1-vs2.0.2.2-rc4/block/cfq-iosched.c
---- linux-2.6.18.1/block/cfq-iosched.c 2006-09-20 16:58:06 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/block/cfq-iosched.c 2006-10-17 01:20:07 +0200
+diff -NurpP --minimal linux-2.6.18.2/block/cfq-iosched.c linux-2.6.18.2-vs2.0.2.2-rc5/block/cfq-iosched.c
+--- linux-2.6.18.2/block/cfq-iosched.c 2006-09-20 16:58:06 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/block/cfq-iosched.c 2006-10-17 01:20:07 +0200
@@ -326,6 +326,8 @@ static int cfq_queue_empty(request_queue
static inline pid_t cfq_queue_pid(struct task_struct *task, int rw)
@@ -2095,9 +2096,9 @@
if (rw == READ || rw == WRITE_SYNC)
return task->pid;
-diff -NurpP --minimal linux-2.6.18.1/drivers/block/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Kconfig
---- linux-2.6.18.1/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Kconfig 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/block/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/Kconfig
+--- linux-2.6.18.2/drivers/block/Kconfig 2006-09-20 16:58:07 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/Kconfig 2006-09-20 17:01:44 +0200
@@ -315,6 +315,13 @@ config BLK_DEV_CRYPTOLOOP
instead, which can be configured to be on-disk compatible with the
cryptoloop device.
@@ -2112,18 +2113,18 @@
config BLK_DEV_NBD
tristate "Network block device support"
depends on NET
-diff -NurpP --minimal linux-2.6.18.1/drivers/block/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Makefile
---- linux-2.6.18.1/drivers/block/Makefile 2006-06-18 04:52:46 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/Makefile 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/block/Makefile linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/Makefile
+--- linux-2.6.18.2/drivers/block/Makefile 2006-06-18 04:52:46 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/Makefile 2006-09-20 17:01:44 +0200
@@ -29,4 +29,5 @@ obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryp
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
+obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o
-diff -NurpP --minimal linux-2.6.18.1/drivers/block/loop.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/loop.c
---- linux-2.6.18.1/drivers/block/loop.c 2006-09-20 16:58:07 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/loop.c 2006-10-17 02:40:33 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/block/loop.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/loop.c
+--- linux-2.6.18.2/drivers/block/loop.c 2006-09-20 16:58:07 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/loop.c 2006-10-17 02:40:33 +0200
@@ -72,6 +72,7 @@
#include <linux/completion.h>
#include <linux/highmem.h>
@@ -2150,9 +2151,9 @@
if (error < 0)
goto out_putf;
wait_for_completion(&lo->lo_done);
-diff -NurpP --minimal linux-2.6.18.1/drivers/block/vroot.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/vroot.c
---- linux-2.6.18.1/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/block/vroot.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/vroot.c
+--- linux-2.6.18.2/drivers/block/vroot.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/block/vroot.c 2006-09-21 01:26:54 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/drivers/block/vroot.c
@@ -2435,9 +2436,9 @@
+
+#endif
+
-diff -NurpP --minimal linux-2.6.18.1/drivers/char/random.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/random.c
---- linux-2.6.18.1/drivers/char/random.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/random.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/char/random.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/char/random.c
+--- linux-2.6.18.2/drivers/char/random.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/char/random.c 2006-09-20 17:01:44 +0200
@@ -1173,7 +1173,7 @@ static char sysctl_bootid[16];
static int proc_do_uuid(ctl_table *table, int write, struct file *filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
@@ -2447,9 +2448,9 @@
unsigned char buf[64], tmp_uuid[16], *uuid;
uuid = table->data;
-diff -NurpP --minimal linux-2.6.18.1/drivers/char/tty_io.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/tty_io.c
---- linux-2.6.18.1/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/char/tty_io.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/char/tty_io.c
+--- linux-2.6.18.2/drivers/char/tty_io.c 2006-09-20 16:58:13 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/char/tty_io.c 2006-09-20 19:55:41 +0200
@@ -103,6 +103,7 @@
#include <linux/selection.h>
@@ -2485,9 +2486,9 @@
if (pgrp < 0)
return -EINVAL;
if (session_of_pgrp(pgrp) != current->signal->session)
-diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/core/uverbs_mem.c
---- linux-2.6.18.1/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/infiniband/core/uverbs_mem.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/infiniband/core/uverbs_mem.c
+--- linux-2.6.18.2/drivers/infiniband/core/uverbs_mem.c 2006-06-18 04:53:04 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/infiniband/core/uverbs_mem.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/mm.h>
@@ -2525,9 +2526,9 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-2.6.18.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-2.6.18.2/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 16:58:14 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/infiniband/hw/ipath/ipath_user_pages.c 2006-09-20 17:01:44 +0200
@@ -33,6 +33,7 @@
#include <linux/mm.h>
@@ -2573,9 +2574,9 @@
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
-diff -NurpP --minimal linux-2.6.18.1/drivers/s390/cio/cio.c linux-2.6.18.1-vs2.0.2.2-rc4/drivers/s390/cio/cio.c
---- linux-2.6.18.1/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/drivers/s390/cio/cio.c 2006-10-17 01:58:48 +0200
+diff -NurpP --minimal linux-2.6.18.2/drivers/s390/cio/cio.c linux-2.6.18.2-vs2.0.2.2-rc5/drivers/s390/cio/cio.c
+--- linux-2.6.18.2/drivers/s390/cio/cio.c 2006-09-20 16:58:27 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/drivers/s390/cio/cio.c 2006-10-17 01:58:48 +0200
@@ -639,12 +639,16 @@ do_IRQ (struct pt_regs *regs)
spin_lock(&sch->lock);
/* Store interrupt response block to lowcore. */
@@ -2593,9 +2594,9 @@
}
if (sch)
spin_unlock(&sch->lock);
-diff -NurpP --minimal linux-2.6.18.1/fs/attr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/attr.c
---- linux-2.6.18.1/fs/attr.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/attr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/attr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/attr.c
+--- linux-2.6.18.2/fs/attr.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/attr.c 2006-09-20 17:01:44 +0200
@@ -15,6 +15,9 @@
#include <linux/fcntl.h>
#include <linux/quotaops.h>
@@ -2654,9 +2655,9 @@
error = DQUOT_TRANSFER(inode, attr) ? -EDQUOT : 0;
if (!error)
error = inode_setattr(inode, attr);
-diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_aout.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_aout.c
---- linux-2.6.18.1/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_aout.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_aout.c
+--- linux-2.6.18.2/fs/binfmt_aout.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_aout.c 2006-09-20 17:01:44 +0200
@@ -24,6 +24,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
@@ -2665,9 +2666,9 @@
#include <asm/system.h>
#include <asm/uaccess.h>
-diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf.c
---- linux-2.6.18.1/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_elf.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_elf.c
+--- linux-2.6.18.2/fs/binfmt_elf.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_elf.c 2006-09-20 18:28:33 +0200
@@ -39,6 +39,8 @@
#include <linux/syscalls.h>
#include <linux/random.h>
@@ -2677,9 +2678,9 @@
#include <asm/uaccess.h>
#include <asm/param.h>
#include <asm/page.h>
-diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_elf_fdpic.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf_fdpic.c
---- linux-2.6.18.1/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_elf_fdpic.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_elf_fdpic.c
+--- linux-2.6.18.2/fs/binfmt_elf_fdpic.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_elf_fdpic.c 2006-09-20 17:01:44 +0200
@@ -34,6 +34,7 @@
#include <linux/elf.h>
#include <linux/elf-fdpic.h>
@@ -2688,9 +2689,9 @@
#include <asm/uaccess.h>
#include <asm/param.h>
-diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_flat.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_flat.c
---- linux-2.6.18.1/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_flat.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_flat.c
+--- linux-2.6.18.2/fs/binfmt_flat.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_flat.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/init.h>
#include <linux/flat.h>
@@ -2699,9 +2700,9 @@
#include <asm/byteorder.h>
#include <asm/system.h>
-diff -NurpP --minimal linux-2.6.18.1/fs/binfmt_som.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_som.c
---- linux-2.6.18.1/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/binfmt_som.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_som.c
+--- linux-2.6.18.2/fs/binfmt_som.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/binfmt_som.c 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#include <linux/shm.h>
#include <linux/personality.h>
@@ -2710,9 +2711,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.18.1/fs/devpts/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/devpts/inode.c
---- linux-2.6.18.1/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/devpts/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/devpts/inode.c
+--- linux-2.6.18.2/fs/devpts/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/devpts/inode.c 2006-09-20 17:01:44 +0200
@@ -20,7 +20,19 @@
#include <linux/devpts_fs.h>
#include <linux/parser.h>
@@ -2779,9 +2780,9 @@
inode->u.generic_ip = tty;
dentry = get_node(number);
-diff -NurpP --minimal linux-2.6.18.1/fs/exec.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/exec.c
---- linux-2.6.18.1/fs/exec.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/exec.c 2006-09-20 18:03:28 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/exec.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/exec.c
+--- linux-2.6.18.2/fs/exec.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/exec.c 2006-09-20 18:03:28 +0200
@@ -49,6 +49,8 @@
#include <linux/acct.h>
#include <linux/cn_proc.h>
@@ -2810,9 +2811,9 @@
up_read(&uts_sem);
if (rc > out_end - out_ptr)
goto out;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/balloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/balloc.c
---- linux-2.6.18.1/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/balloc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/balloc.c
+--- linux-2.6.18.2/fs/ext2/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/balloc.c 2006-10-16 19:05:41 +0200
@@ -16,6 +16,7 @@
#include <linux/sched.h>
#include <linux/buffer_head.h>
@@ -2866,9 +2867,9 @@
release_blocks(sb, es_alloc);
out_dquot:
DQUOT_FREE_BLOCK(inode, dq_alloc);
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ext2.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ext2.h
---- linux-2.6.18.1/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/ext2.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ext2.h
+--- linux-2.6.18.2/fs/ext2/ext2.h 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ext2.h 2006-09-20 19:55:12 +0200
@@ -165,6 +165,7 @@ extern const struct file_operations ext2
extern const struct address_space_operations ext2_aops;
extern const struct address_space_operations ext2_aops_xip;
@@ -2877,18 +2878,18 @@
/* namei.c */
extern struct inode_operations ext2_dir_inode_operations;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/file.c
---- linux-2.6.18.1/fs/ext2/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/file.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/file.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/file.c
+--- linux-2.6.18.2/fs/ext2/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/file.c 2006-09-20 17:01:44 +0200
@@ -81,4 +81,5 @@ struct inode_operations ext2_file_inode_
#endif
.setattr = ext2_setattr,
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ialloc.c
---- linux-2.6.18.1/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/ialloc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ialloc.c
+--- linux-2.6.18.2/fs/ext2/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ialloc.c 2006-09-20 17:01:44 +0200
@@ -17,6 +17,8 @@
#include <linux/backing-dev.h>
#include <linux/buffer_head.h>
@@ -2944,9 +2945,9 @@
make_bad_inode(inode);
iput(inode);
return ERR_PTR(err);
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/inode.c
---- linux-2.6.18.1/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/inode.c
+--- linux-2.6.18.2/fs/ext2/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/inode.c 2006-11-06 05:08:58 +0100
@@ -31,6 +31,7 @@
#include <linux/writeback.h>
#include <linux/buffer_head.h>
@@ -2955,6 +2956,15 @@
#include "ext2.h"
#include "acl.h"
#include "xip.h"
+@@ -913,7 +914,7 @@ void ext2_truncate (struct inode * inode
+ return;
+ if (ext2_inode_is_fast_symlink(inode))
+ return;
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ return;
+
+ ext2_discard_prealloc(inode);
@@ -1042,25 +1043,70 @@ void ext2_set_inode_flags(struct inode *
{
unsigned int flags = EXT2_I(inode)->i_flags;
@@ -3082,9 +3092,9 @@
error = DQUOT_TRANSFER(inode, iattr) ? -EDQUOT : 0;
if (error)
return error;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ioctl.c
---- linux-2.6.18.1/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ioctl.c
+--- linux-2.6.18.2/fs/ext2/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/ioctl.c 2006-09-20 17:01:44 +0200
@@ -11,6 +11,7 @@
#include <linux/capability.h>
#include <linux/time.h>
@@ -3124,9 +3134,9 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *) arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/namei.c
---- linux-2.6.18.1/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/namei.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/namei.c
+--- linux-2.6.18.2/fs/ext2/namei.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/namei.c 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@
*/
@@ -3157,9 +3167,9 @@
.permission = ext2_permission,
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/super.c
---- linux-2.6.18.1/fs/ext2/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/super.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/super.c
+--- linux-2.6.18.2/fs/ext2/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/super.c 2006-09-20 17:01:44 +0200
@@ -325,7 +325,7 @@ enum {
Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -3212,9 +3222,9 @@
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.18.1/fs/ext2/symlink.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/symlink.c
---- linux-2.6.18.1/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/symlink.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/symlink.c
+--- linux-2.6.18.2/fs/ext2/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/symlink.c 2006-09-20 17:01:44 +0200
@@ -38,6 +38,7 @@ struct inode_operations ext2_symlink_ino
.listxattr = ext2_listxattr,
.removexattr = generic_removexattr,
@@ -3229,9 +3239,9 @@
#endif
+ .sync_flags = ext2_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext2/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/xattr.c
---- linux-2.6.18.1/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext2/xattr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/xattr.c
+--- linux-2.6.18.2/fs/ext2/xattr.c 2006-02-18 14:40:21 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext2/xattr.c 2006-09-20 17:01:44 +0200
@@ -60,6 +60,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3269,9 +3279,9 @@
DQUOT_FREE_BLOCK(inode, 1);
}
EXT2_I(inode)->i_file_acl = 0;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/balloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/balloc.c
---- linux-2.6.18.1/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/balloc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/balloc.c
+--- linux-2.6.18.2/fs/ext3/balloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/balloc.c 2006-10-16 19:06:32 +0200
@@ -19,6 +19,7 @@
#include <linux/ext3_jbd.h>
#include <linux/quotaops.h>
@@ -3370,9 +3380,9 @@
if (fatal) {
*errp = fatal;
ext3_std_error(sb, fatal);
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/file.c
---- linux-2.6.18.1/fs/ext3/file.c 2006-06-18 04:54:33 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/file.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/file.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/file.c
+--- linux-2.6.18.2/fs/ext3/file.c 2006-06-18 04:54:33 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/file.c 2006-09-20 17:01:44 +0200
@@ -133,5 +133,6 @@ struct inode_operations ext3_file_inode_
.removexattr = generic_removexattr,
#endif
@@ -3380,9 +3390,9 @@
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ialloc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ialloc.c
---- linux-2.6.18.1/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/ialloc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/ialloc.c
+--- linux-2.6.18.2/fs/ext3/ialloc.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/ialloc.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,8 @@
#include <linux/buffer_head.h>
#include <linux/random.h>
@@ -3440,9 +3450,9 @@
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
iput(inode);
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/inode.c
---- linux-2.6.18.1/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/inode.c
+--- linux-2.6.18.2/fs/ext3/inode.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/inode.c 2006-11-06 05:08:58 +0100
@@ -36,6 +36,7 @@
#include <linux/writeback.h>
#include <linux/mpage.h>
@@ -3451,6 +3461,15 @@
#include "xattr.h"
#include "acl.h"
+@@ -2245,7 +2246,7 @@ void ext3_truncate(struct inode *inode)
+ return;
+ if (ext3_inode_is_fast_symlink(inode))
+ return;
+- if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
++ if (IS_APPEND(inode) || IS_IXORUNLINK(inode))
+ return;
+
+ /*
@@ -2567,19 +2568,77 @@ void ext3_set_inode_flags(struct inode *
{
unsigned int flags = EXT3_I(inode)->i_flags;
@@ -3630,9 +3649,9 @@
error = ext3_mark_inode_dirty(handle, inode);
ext3_journal_stop(handle);
}
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ioctl.c
---- linux-2.6.18.1/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/ioctl.c
+--- linux-2.6.18.2/fs/ext3/ioctl.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/ioctl.c 2006-09-20 17:01:44 +0200
@@ -8,11 +8,13 @@
*/
@@ -3747,9 +3766,9 @@
default:
return -ENOTTY;
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/namei.c
---- linux-2.6.18.1/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/namei.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/namei.c
+--- linux-2.6.18.2/fs/ext3/namei.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/namei.c 2006-09-20 17:01:44 +0200
@@ -36,6 +36,7 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
@@ -3780,9 +3799,9 @@
.permission = ext3_permission,
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/super.c
---- linux-2.6.18.1/fs/ext3/super.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/super.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/super.c
+--- linux-2.6.18.2/fs/ext3/super.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/super.c 2006-09-20 17:01:44 +0200
@@ -677,7 +677,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
@@ -3835,9 +3854,9 @@
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.18.1/fs/ext3/symlink.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/symlink.c
---- linux-2.6.18.1/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/symlink.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/symlink.c
+--- linux-2.6.18.2/fs/ext3/symlink.c 2005-08-29 22:25:30 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/symlink.c 2006-09-20 17:01:44 +0200
@@ -40,6 +40,7 @@ struct inode_operations ext3_symlink_ino
.listxattr = ext3_listxattr,
.removexattr = generic_removexattr,
@@ -3852,9 +3871,9 @@
#endif
+ .sync_flags = ext3_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/ext3/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/xattr.c
---- linux-2.6.18.1/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ext3/xattr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/xattr.c
+--- linux-2.6.18.2/fs/ext3/xattr.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ext3/xattr.c 2006-09-20 17:01:44 +0200
@@ -58,6 +58,7 @@
#include <linux/mbcache.h>
#include <linux/quotaops.h>
@@ -3896,9 +3915,9 @@
goto cleanup;
bad_block:
-diff -NurpP --minimal linux-2.6.18.1/fs/fcntl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/fcntl.c
---- linux-2.6.18.1/fs/fcntl.c 2006-06-18 04:54:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/fcntl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/fcntl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/fcntl.c
+--- linux-2.6.18.2/fs/fcntl.c 2006-06-18 04:54:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/fcntl.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/ptrace.h>
#include <linux/signal.h>
@@ -3952,9 +3971,9 @@
if (p) {
send_sigurg_to_task(p, fown);
}
-diff -NurpP --minimal linux-2.6.18.1/fs/file_table.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/file_table.c
---- linux-2.6.18.1/fs/file_table.c 2006-09-20 16:58:34 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/file_table.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/file_table.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/file_table.c
+--- linux-2.6.18.2/fs/file_table.c 2006-09-20 16:58:34 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/file_table.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,8 @@
#include <linux/fsnotify.h>
#include <linux/sysctl.h>
@@ -3991,9 +4010,9 @@
file_kill(file);
file_free(file);
}
-diff -NurpP --minimal linux-2.6.18.1/fs/hfsplus/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/hfsplus/ioctl.c
---- linux-2.6.18.1/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/hfsplus/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/hfsplus/ioctl.c
+--- linux-2.6.18.2/fs/hfsplus/ioctl.c 2006-04-09 13:49:53 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/hfsplus/ioctl.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,7 @@
#include <linux/fs.h>
#include <linux/sched.h>
@@ -4012,9 +4031,9 @@
return -EROFS;
if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-diff -NurpP --minimal linux-2.6.18.1/fs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/inode.c
---- linux-2.6.18.1/fs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/inode.c
+--- linux-2.6.18.2/fs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/inode.c 2006-09-20 17:01:44 +0200
@@ -115,6 +115,9 @@ static struct inode *alloc_inode(struct
struct address_space * const mapping = &inode->i_data;
@@ -4034,9 +4053,9 @@
/**
* clear_inode - clear an inode
* @inode: inode to clear
-diff -NurpP --minimal linux-2.6.18.1/fs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioctl.c
---- linux-2.6.18.1/fs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ioctl.c
+--- linux-2.6.18.2/fs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -12,10 +12,19 @@
#include <linux/fs.h>
#include <linux/security.h>
@@ -4106,9 +4125,9 @@
default:
if (S_ISREG(filp->f_dentry->d_inode->i_mode))
error = file_ioctl(filp, cmd, arg);
-diff -NurpP --minimal linux-2.6.18.1/fs/ioprio.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioprio.c
---- linux-2.6.18.1/fs/ioprio.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/ioprio.c 2006-10-18 01:19:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/ioprio.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/ioprio.c
+--- linux-2.6.18.2/fs/ioprio.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/ioprio.c 2006-10-18 01:19:40 +0200
@@ -104,7 +104,7 @@ asmlinkage long sys_ioprio_set(int which
if (!who)
user = current->user;
@@ -4127,9 +4146,9 @@
if (!user)
break;
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/acl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/acl.c
---- linux-2.6.18.1/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/acl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/acl.c
+--- linux-2.6.18.2/fs/jfs/acl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/acl.c 2006-09-20 17:01:44 +0200
@@ -232,7 +232,8 @@ int jfs_setattr(struct dentry *dentry, s
return rc;
@@ -4140,9 +4159,9 @@
if (DQUOT_TRANSFER(inode, iattr))
return -EDQUOT;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/file.c
---- linux-2.6.18.1/fs/jfs/file.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/file.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/file.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/file.c
+--- linux-2.6.18.2/fs/jfs/file.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/file.c 2006-09-20 17:01:44 +0200
@@ -98,6 +98,7 @@ struct inode_operations jfs_file_inode_o
.setattr = jfs_setattr,
.permission = jfs_permission,
@@ -4151,9 +4170,9 @@
};
const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/inode.c
---- linux-2.6.18.1/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/inode.c
+--- linux-2.6.18.2/fs/jfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/inode.c 2006-09-20 17:01:44 +0200
@@ -22,6 +22,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4170,9 +4189,9 @@
}
clear_inode(inode);
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/ioctl.c
---- linux-2.6.18.1/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/ioctl.c
+--- linux-2.6.18.2/fs/jfs/ioctl.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -10,6 +10,7 @@
#include <linux/ctype.h>
#include <linux/capability.h>
@@ -4202,9 +4221,9 @@
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dinode.h
---- linux-2.6.18.1/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_dinode.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_dinode.h
+--- linux-2.6.18.2/fs/jfs/jfs_dinode.h 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_dinode.h 2006-09-20 17:01:44 +0200
@@ -162,9 +162,12 @@ struct dinode {
#define JFS_APPEND_FL 0x01000000 /* writes to file may only append */
#define JFS_IMMUTABLE_FL 0x02000000 /* Immutable file */
@@ -4220,9 +4239,9 @@
/* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
#define JFS_IOC_GETFLAGS _IOR('f', 1, long)
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_dtree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dtree.c
---- linux-2.6.18.1/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_dtree.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_dtree.c
+--- linux-2.6.18.2/fs/jfs/jfs_dtree.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_dtree.c 2006-09-20 17:01:44 +0200
@@ -102,6 +102,7 @@
#include <linux/fs.h>
@@ -4332,9 +4351,9 @@
/* Free quota allocation */
DQUOT_FREE_BLOCK(ip, xlen);
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_extent.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_extent.c
---- linux-2.6.18.1/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_extent.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_extent.c
+--- linux-2.6.18.2/fs/jfs/jfs_extent.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_extent.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/fs.h>
@@ -4395,9 +4414,9 @@
DQUOT_FREE_BLOCK(ip, nxlen);
goto exit;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_filsys.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_filsys.h
---- linux-2.6.18.1/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_filsys.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_filsys.h
+--- linux-2.6.18.2/fs/jfs/jfs_filsys.h 2005-10-28 20:49:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_filsys.h 2006-09-20 17:01:44 +0200
@@ -84,6 +84,7 @@
#define JFS_DIR_INDEX 0x00200000 /* Persistant index for */
/* directory entries */
@@ -4406,9 +4425,9 @@
/*
* buffer cache configuration
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_imap.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_imap.c
---- linux-2.6.18.1/fs/jfs/jfs_imap.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_imap.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_imap.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_imap.c
+--- linux-2.6.18.2/fs/jfs/jfs_imap.c 2006-11-04 19:43:23 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_imap.c 2006-11-06 04:47:17 +0100
@@ -45,6 +45,7 @@
#include <linux/buffer_head.h>
#include <linux/pagemap.h>
@@ -4468,9 +4487,9 @@
/*
* mode2 is only needed for storing the higher order bits.
* Trust i_mode for the lower order ones
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.c
---- linux-2.6.18.1/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_inode.c
+--- linux-2.6.18.2/fs/jfs/jfs_inode.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_inode.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,8 @@
#include <linux/fs.h>
@@ -4562,9 +4581,9 @@
DQUOT_DROP(inode);
inode->i_flags |= S_NOQUOTA;
inode->i_nlink = 0;
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_inode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.h
---- linux-2.6.18.1/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_inode.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_inode.h
+--- linux-2.6.18.2/fs/jfs/jfs_inode.h 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_inode.h 2006-09-20 17:01:44 +0200
@@ -31,6 +31,7 @@ extern void jfs_truncate(struct inode *)
extern void jfs_truncate_nolock(struct inode *, loff_t);
extern void jfs_free_zero_link(struct inode *);
@@ -4573,9 +4592,9 @@
extern void jfs_set_inode_flags(struct inode *);
extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/jfs_xtree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_xtree.c
---- linux-2.6.18.1/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/jfs_xtree.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_xtree.c
+--- linux-2.6.18.2/fs/jfs/jfs_xtree.c 2006-01-03 17:29:57 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/jfs_xtree.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/fs.h>
@@ -4659,9 +4678,9 @@
/* update quota allocation to reflect freed blocks */
DQUOT_FREE_BLOCK(ip, nfreed);
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/namei.c
---- linux-2.6.18.1/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/namei.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/namei.c
+--- linux-2.6.18.2/fs/jfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/namei.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/fs.h>
#include <linux/ctype.h>
@@ -4686,9 +4705,9 @@
};
const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/super.c
---- linux-2.6.18.1/fs/jfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/super.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/super.c
+--- linux-2.6.18.2/fs/jfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/super.c 2006-09-20 17:01:44 +0200
@@ -194,7 +194,8 @@ static void jfs_put_super(struct super_b
enum {
Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -4743,9 +4762,9 @@
if (newLVSize) {
printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-2.6.18.1/fs/jfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/xattr.c
---- linux-2.6.18.1/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/jfs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/xattr.c
+--- linux-2.6.18.2/fs/jfs/xattr.c 2006-06-18 04:54:36 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/jfs/xattr.c 2006-09-20 17:01:44 +0200
@@ -23,6 +23,7 @@
#include <linux/posix_acl_xattr.h>
#include <linux/quotaops.h>
@@ -4823,9 +4842,9 @@
inode->i_ctime = CURRENT_TIME;
-diff -NurpP --minimal linux-2.6.18.1/fs/libfs.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/libfs.c
---- linux-2.6.18.1/fs/libfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/libfs.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/libfs.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/libfs.c
+--- linux-2.6.18.2/fs/libfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/libfs.c 2006-09-20 17:01:44 +0200
@@ -124,7 +124,8 @@ static inline unsigned char dt_type(stru
* both impossible due to the lock on directory.
*/
@@ -4872,9 +4891,9 @@
EXPORT_SYMBOL(generic_read_dir);
EXPORT_SYMBOL(get_sb_pseudo);
EXPORT_SYMBOL(simple_commit_write);
-diff -NurpP --minimal linux-2.6.18.1/fs/lockd/clntproc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/lockd/clntproc.c
---- linux-2.6.18.1/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/lockd/clntproc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/lockd/clntproc.c
+--- linux-2.6.18.2/fs/lockd/clntproc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/lockd/clntproc.c 2006-09-20 17:01:44 +0200
@@ -17,6 +17,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/lockd/lockd.h>
@@ -4897,9 +4916,9 @@
lock->svid = fl->fl_u.nfs_fl.owner->pid;
lock->fl.fl_start = fl->fl_start;
lock->fl.fl_end = fl->fl_end;
-diff -NurpP --minimal linux-2.6.18.1/fs/locks.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/locks.c
---- linux-2.6.18.1/fs/locks.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/locks.c 2006-09-20 18:02:37 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/locks.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/locks.c
+--- linux-2.6.18.2/fs/locks.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/locks.c 2006-09-20 18:02:37 +0200
@@ -125,6 +125,7 @@
#include <linux/syscalls.h>
#include <linux/time.h>
@@ -5058,9 +5077,9 @@
lock_get_status(q, fl, ++i, "");
move_lock_status(&q, &pos, offset);
-diff -NurpP --minimal linux-2.6.18.1/fs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/namei.c
---- linux-2.6.18.1/fs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/namei.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/namei.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/namei.c
+--- linux-2.6.18.2/fs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/namei.c 2006-09-20 17:01:44 +0200
@@ -32,6 +32,9 @@
#include <linux/file.h>
#include <linux/fcntl.h>
@@ -5395,9 +5414,9 @@
new_dentry = lookup_hash(&newnd);
error = PTR_ERR(new_dentry);
if (IS_ERR(new_dentry))
-diff -NurpP --minimal linux-2.6.18.1/fs/namespace.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/namespace.c
---- linux-2.6.18.1/fs/namespace.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/namespace.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/namespace.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/namespace.c
+--- linux-2.6.18.2/fs/namespace.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/namespace.c 2006-09-20 17:01:44 +0200
@@ -22,6 +22,8 @@
#include <linux/namei.h>
#include <linux/security.h>
@@ -5709,9 +5728,9 @@
err = -EPERM;
goto out;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/nfs/dir.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/dir.c
---- linux-2.6.18.1/fs/nfs/dir.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/dir.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfs/dir.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/dir.c
+--- linux-2.6.18.2/fs/nfs/dir.c 2006-11-04 19:43:23 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/dir.c 2006-11-06 04:47:17 +0100
@@ -28,9 +28,11 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
@@ -5724,7 +5743,7 @@
#include "nfs4_fs.h"
#include "delegation.h"
-@@ -922,6 +924,7 @@ static struct dentry *nfs_lookup(struct
+@@ -928,6 +930,7 @@ static struct dentry *nfs_lookup(struct
res = (struct dentry *)inode;
if (IS_ERR(res))
goto out_unlock;
@@ -5732,7 +5751,7 @@
no_entry:
res = d_add_unique(dentry, inode);
if (res != NULL)
-@@ -955,7 +958,8 @@ static int is_atomic_open(struct inode *
+@@ -961,7 +964,8 @@ static int is_atomic_open(struct inode *
if (nd->flags & LOOKUP_DIRECTORY)
return 0;
/* Are we trying to write to a read only partition? */
@@ -5742,9 +5761,9 @@
return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/nfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/inode.c
---- linux-2.6.18.1/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/inode.c
+--- linux-2.6.18.2/fs/nfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/inode.c 2006-09-21 01:31:36 +0200
@@ -37,6 +37,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -5839,9 +5858,9 @@
if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
/*
-diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfs3xdr.c
---- linux-2.6.18.1/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfs/nfs3xdr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/nfs3xdr.c
+--- linux-2.6.18.2/fs/nfs/nfs3xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/nfs3xdr.c 2006-09-20 19:47:41 +0200
@@ -22,6 +22,7 @@
#include <linux/nfs3.h>
#include <linux/nfs_fs.h>
@@ -5931,9 +5950,9 @@
if (args->type == NF3CHR || args->type == NF3BLK) {
*p++ = htonl(MAJOR(args->rdev));
*p++ = htonl(MINOR(args->rdev));
-diff -NurpP --minimal linux-2.6.18.1/fs/nfs/nfsroot.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfsroot.c
---- linux-2.6.18.1/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfs/nfsroot.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/nfsroot.c
+--- linux-2.6.18.2/fs/nfs/nfsroot.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/nfsroot.c 2006-09-20 17:01:44 +0200
@@ -87,6 +87,7 @@
#include <linux/root_dev.h>
#include <net/ipconfig.h>
@@ -5980,9 +5999,9 @@
if (strlen(buf) + strlen(cp) > NFS_MAXPATHLEN) {
printk(KERN_ERR "Root-NFS: Pathname for remote directory too long.\n");
return -1;
-diff -NurpP --minimal linux-2.6.18.1/fs/nfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/super.c
---- linux-2.6.18.1/fs/nfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfs/super.c 2006-09-20 20:28:12 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfs/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/super.c
+--- linux-2.6.18.2/fs/nfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfs/super.c 2006-09-20 20:28:12 +0200
@@ -40,6 +40,7 @@
#include <linux/vfs.h>
#include <linux/inet.h>
@@ -6022,9 +6041,9 @@
return clnt;
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/auth.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/auth.c
---- linux-2.6.18.1/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/auth.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/auth.c
+--- linux-2.6.18.2/fs/nfsd/auth.c 2006-06-18 04:54:42 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/auth.c 2006-09-20 17:01:44 +0200
@@ -9,6 +9,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth.h>
@@ -6059,9 +6078,9 @@
cap_t(current->cap_effective) &= ~CAP_NFSD_MASK;
} else {
cap_t(current->cap_effective) |= (CAP_NFSD_MASK &
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs3xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs3xdr.c
---- linux-2.6.18.1/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfs3xdr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs3xdr.c
+--- linux-2.6.18.2/fs/nfsd/nfs3xdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs3xdr.c 2006-09-20 17:01:44 +0200
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
@@ -6110,9 +6129,9 @@
if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
} else {
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4recover.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4recover.c
---- linux-2.6.18.1/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfs4recover.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs4recover.c
+--- linux-2.6.18.2/fs/nfsd/nfs4recover.c 2006-02-18 14:40:23 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs4recover.c 2006-09-20 17:01:44 +0200
@@ -155,7 +155,7 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
@@ -6140,9 +6159,9 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfs4xdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4xdr.c
---- linux-2.6.18.1/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfs4xdr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs4xdr.c
+--- linux-2.6.18.2/fs/nfsd/nfs4xdr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfs4xdr.c 2006-09-20 17:01:44 +0200
@@ -57,6 +57,7 @@
#include <linux/nfsd_idmap.h>
#include <linux/nfs4.h>
@@ -6172,9 +6191,9 @@
if (status == nfserr_resource)
goto out_resource;
if (status)
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/nfsxdr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfsxdr.c
---- linux-2.6.18.1/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/nfsxdr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfsxdr.c
+--- linux-2.6.18.2/fs/nfsd/nfsxdr.c 2006-04-09 13:49:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/nfsxdr.c 2006-09-20 17:01:44 +0200
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
@@ -6223,9 +6242,9 @@
if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
*p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-2.6.18.1/fs/nfsd/vfs.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/vfs.c
---- linux-2.6.18.1/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/nfsd/vfs.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/vfs.c
+--- linux-2.6.18.2/fs/nfsd/vfs.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/nfsd/vfs.c 2006-09-20 17:01:44 +0200
@@ -1158,13 +1158,13 @@ nfsd_create(struct svc_rqst *rqstp, stru
err = vfs_create(dirp, dchild, iap->ia_mode, NULL);
break;
@@ -6289,9 +6308,9 @@
return nfserr_rofs;
if (/* (acc & MAY_WRITE) && */ IS_IMMUTABLE(inode))
return nfserr_perm;
-diff -NurpP --minimal linux-2.6.18.1/fs/open.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/open.c
---- linux-2.6.18.1/fs/open.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/open.c 2006-09-20 21:05:31 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/open.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/open.c
+--- linux-2.6.18.2/fs/open.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/open.c 2006-09-20 21:05:31 +0200
@@ -28,6 +28,9 @@
#include <linux/syscalls.h>
#include <linux/rcupdate.h>
@@ -6465,9 +6484,9 @@
}
void fastcall put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/array.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/array.c
---- linux-2.6.18.1/fs/proc/array.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/array.c 2006-10-25 03:43:38 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/array.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/array.c
+--- linux-2.6.18.2/fs/proc/array.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/array.c 2006-10-25 03:43:38 +0200
@@ -75,6 +75,8 @@
#include <linux/cpuset.h>
#include <linux/rcupdate.h>
@@ -6629,9 +6648,9 @@
tcomm,
state,
ppid,
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/base.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/base.c
---- linux-2.6.18.1/fs/proc/base.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/base.c 2006-10-29 04:48:56 +0100
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/base.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/base.c
+--- linux-2.6.18.2/fs/proc/base.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/base.c 2006-11-06 05:36:38 +0100
@@ -71,6 +71,9 @@
#include <linux/cpuset.h>
#include <linux/audit.h>
@@ -6885,9 +6904,9 @@
len = snprintf(buf, sizeof(buf), "%d", tid);
ino = fake_ino(tid, PROC_TID_INO);
if (filldir(dirent, buf, len, pos, ino, DT_DIR < 0)) {
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/generic.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/generic.c
---- linux-2.6.18.1/fs/proc/generic.c 2006-06-18 04:54:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/generic.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/generic.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/generic.c
+--- linux-2.6.18.2/fs/proc/generic.c 2006-06-18 04:54:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/generic.c 2006-09-20 17:01:44 +0200
@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/bitops.h>
@@ -6947,9 +6966,9 @@
} else {
kfree(ent);
ent = NULL;
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/inode.c
---- linux-2.6.18.1/fs/proc/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/inode.c
+--- linux-2.6.18.2/fs/proc/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/inode.c 2006-09-20 17:01:44 +0200
@@ -168,6 +168,8 @@ struct inode *proc_get_inode(struct supe
inode->i_uid = de->uid;
inode->i_gid = de->gid;
@@ -6959,9 +6978,9 @@
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/internal.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/internal.h
---- linux-2.6.18.1/fs/proc/internal.h 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/internal.h 2006-10-25 03:49:22 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/internal.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/internal.h
+--- linux-2.6.18.2/fs/proc/internal.h 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/internal.h 2006-11-06 05:08:58 +0100
@@ -10,6 +10,7 @@
*/
@@ -6979,9 +6998,9 @@
}
static inline int proc_fd(struct inode *inode)
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/proc_misc.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/proc_misc.c
---- linux-2.6.18.1/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/proc_misc.c 2006-10-25 03:50:01 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/proc_misc.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/proc_misc.c
+--- linux-2.6.18.2/fs/proc/proc_misc.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/proc_misc.c 2006-10-25 03:50:01 +0200
@@ -81,17 +81,32 @@ static int proc_calc_metrics(char *page,
static int loadavg_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
@@ -7051,9 +7070,9 @@
return proc_calc_metrics(page, start, off, count, eof, len);
}
-diff -NurpP --minimal linux-2.6.18.1/fs/proc/root.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/root.c
---- linux-2.6.18.1/fs/proc/root.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/proc/root.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/proc/root.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/root.c
+--- linux-2.6.18.2/fs/proc/root.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/proc/root.c 2006-09-20 17:01:44 +0200
@@ -24,6 +24,9 @@ struct proc_dir_entry *proc_net, *proc_n
#ifdef CONFIG_SYSCTL
struct proc_dir_entry *proc_sys_root;
@@ -7072,9 +7091,9 @@
}
static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
-diff -NurpP --minimal linux-2.6.18.1/fs/quota.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/quota.c
---- linux-2.6.18.1/fs/quota.c 2006-06-18 04:54:47 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/quota.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/quota.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/quota.c
+--- linux-2.6.18.2/fs/quota.c 2006-06-18 04:54:47 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/quota.c 2006-09-20 17:01:44 +0200
@@ -17,6 +17,9 @@
#include <linux/buffer_head.h>
#include <linux/capability.h>
@@ -7180,9 +7199,9 @@
sb = get_super(bdev);
bdput(bdev);
if (!sb)
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/bitmap.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/bitmap.c
---- linux-2.6.18.1/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/bitmap.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/bitmap.c
+--- linux-2.6.18.2/fs/reiserfs/bitmap.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/bitmap.c 2006-09-20 17:01:44 +0200
@@ -12,6 +12,7 @@
#include <linux/reiserfs_fs_sb.h>
#include <linux/reiserfs_fs_i.h>
@@ -7275,18 +7294,18 @@
}
return CARRY_ON;
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/file.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/file.c
---- linux-2.6.18.1/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/file.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/file.c
+--- linux-2.6.18.2/fs/reiserfs/file.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/file.c 2006-09-20 17:01:44 +0200
@@ -1586,4 +1586,5 @@ struct inode_operations reiserfs_file_in
.listxattr = reiserfs_listxattr,
.removexattr = reiserfs_removexattr,
.permission = reiserfs_permission,
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/inode.c
---- linux-2.6.18.1/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/inode.c
+--- linux-2.6.18.2/fs/reiserfs/inode.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/inode.c 2006-09-20 17:01:44 +0200
@@ -16,6 +16,8 @@
#include <linux/mpage.h>
#include <linux/writeback.h>
@@ -7470,9 +7489,9 @@
mark_inode_dirty(inode);
error =
journal_end(&th, inode->i_sb, jbegin_count);
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/ioctl.c
---- linux-2.6.18.1/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/ioctl.c
+--- linux-2.6.18.2/fs/reiserfs/ioctl.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/ioctl.c 2006-09-20 17:01:44 +0200
@@ -4,6 +4,7 @@
#include <linux/capability.h>
@@ -7543,9 +7562,9 @@
return -EROFS;
if (get_user(inode->i_generation, (int __user *)arg))
return -EFAULT;
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/namei.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/namei.c
---- linux-2.6.18.1/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/namei.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/namei.c
+--- linux-2.6.18.2/fs/reiserfs/namei.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/namei.c 2006-09-20 17:01:44 +0200
@@ -18,6 +18,7 @@
#include <linux/reiserfs_xattr.h>
#include <linux/smp_lock.h>
@@ -7593,9 +7612,9 @@
+ .sync_flags = reiserfs_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/stree.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/stree.c
---- linux-2.6.18.1/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/stree.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/stree.c
+--- linux-2.6.18.2/fs/reiserfs/stree.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/stree.c 2006-09-20 17:01:44 +0200
@@ -56,6 +56,7 @@
#include <linux/smp_lock.h>
#include <linux/buffer_head.h>
@@ -7671,9 +7690,9 @@
+ }
return retval;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/reiserfs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/super.c
---- linux-2.6.18.1/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/super.c
+--- linux-2.6.18.2/fs/reiserfs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/super.c 2006-09-20 17:01:44 +0200
@@ -882,6 +882,9 @@ static int reiserfs_parse_options(struct
{"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
{"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -7708,9 +7727,9 @@
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.18.1/fs/reiserfs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/xattr.c
---- linux-2.6.18.1/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/reiserfs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/xattr.c
+--- linux-2.6.18.2/fs/reiserfs/xattr.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/reiserfs/xattr.c 2006-09-20 17:01:44 +0200
@@ -35,6 +35,7 @@
#include <linux/namei.h>
#include <linux/errno.h>
@@ -7728,9 +7747,9 @@
reiserfs_write_unlock_xattrs(inode->i_sb);
dput(root);
} else {
-diff -NurpP --minimal linux-2.6.18.1/fs/stat.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/stat.c
---- linux-2.6.18.1/fs/stat.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/stat.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/stat.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/stat.c
+--- linux-2.6.18.2/fs/stat.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/stat.c 2006-09-20 17:01:44 +0200
@@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
stat->nlink = inode->i_nlink;
stat->uid = inode->i_uid;
@@ -7739,9 +7758,9 @@
stat->rdev = inode->i_rdev;
stat->atime = inode->i_atime;
stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-2.6.18.1/fs/super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/super.c
---- linux-2.6.18.1/fs/super.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/super.c 2006-09-20 17:59:47 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/super.c
+--- linux-2.6.18.2/fs/super.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/super.c 2006-09-20 17:59:47 +0200
@@ -37,6 +37,8 @@
#include <linux/idr.h>
#include <linux/kobject.h>
@@ -7793,9 +7812,9 @@
put_filesystem(type);
return mnt;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/sysfs/mount.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/sysfs/mount.c
---- linux-2.6.18.1/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/sysfs/mount.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/sysfs/mount.c
+--- linux-2.6.18.2/fs/sysfs/mount.c 2006-09-20 16:58:35 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/sysfs/mount.c 2006-09-20 17:01:44 +0200
@@ -11,8 +11,6 @@
#include "sysfs.h"
@@ -7814,9 +7833,9 @@
sb->s_op = &sysfs_ops;
sb->s_time_gran = 1;
sysfs_sb = sb;
-diff -NurpP --minimal linux-2.6.18.1/fs/xattr.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xattr.c
---- linux-2.6.18.1/fs/xattr.c 2006-09-20 16:58:37 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xattr.c 2006-09-20 21:08:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xattr.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xattr.c
+--- linux-2.6.18.2/fs/xattr.c 2006-09-20 16:58:37 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xattr.c 2006-09-20 21:08:52 +0200
@@ -18,6 +18,7 @@
#include <linux/module.h>
#include <linux/fsnotify.h>
@@ -7917,9 +7936,9 @@
fput(f);
return error;
}
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_ioctl.c 2006-09-20 17:01:44 +0200
@@ -1095,6 +1095,8 @@ xfs_ioc_fsgeometry(
#define LINUX_XFLAG_APPEND 0x00000020 /* writes to file may only append */
#define LINUX_XFLAG_NODUMP 0x00000040 /* do not dump file */
@@ -7940,9 +7959,9 @@
if (di_flags & XFS_DIFLAG_APPEND)
flags |= LINUX_XFLAG_APPEND;
if (di_flags & XFS_DIFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_iops.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_iops.c 2006-09-21 16:42:52 +0200
@@ -53,6 +53,7 @@
#include <linux/xattr.h>
#include <linux/namei.h>
@@ -8046,9 +8065,9 @@
.removexattr = xfs_vn_removexattr,
+ .sync_flags = xfs_vn_sync_flags,
};
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_linux.h
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_linux.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_linux.h 2006-09-20 18:35:45 +0200
@@ -139,6 +139,7 @@ BUFFER_FNS(PrivateStart, unwritten);
#define current_pid() (current->pid)
#define current_fsuid(cred) (current->fsuid)
@@ -8057,9 +8076,9 @@
#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.18.1/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_super.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_super.c 2006-09-20 18:34:48 +0200
@@ -158,6 +158,7 @@ xfs_revalidate_inode(
inode->i_nlink = ip->i_d.di_nlink;
inode->i_uid = ip->i_d.di_uid;
@@ -8096,9 +8115,9 @@
if (!error)
error = bhv_vfs_mntupdate(vfsp, flags, args);
kmem_free(args, sizeof(*args));
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_sysctl.c
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_sysctl.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_sysctl.c
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 16:58:39 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_sysctl.c 2006-09-20 18:32:51 +0200
@@ -57,79 +57,79 @@ xfs_stats_clear_proc_handler(
STATIC ctl_table xfs_table[] = {
{XFS_RESTRICT_CHOWN, "restrict_chown", &xfs_params.restrict_chown.val,
@@ -8194,9 +8213,9 @@
&xfs_params.stats_clear.min, &xfs_params.stats_clear.max},
#endif /* CONFIG_PROC_FS */
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.c
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_vnode.c
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_vnode.c 2006-09-20 17:01:44 +0200
@@ -119,6 +119,7 @@ vn_revalidate_core(
inode->i_nlink = vap->va_nlink;
inode->i_uid = vap->va_uid;
@@ -8220,9 +8239,9 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
else
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.h
---- linux-2.6.18.1/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_vnode.h
+--- linux-2.6.18.2/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/linux-2.6/xfs_vnode.h 2006-09-20 17:01:44 +0200
@@ -352,6 +352,7 @@ typedef struct bhv_vattr {
xfs_nlink_t va_nlink; /* number of references to file */
uid_t va_uid; /* owner user id */
@@ -8248,9 +8267,9 @@
#define XFS_AT_STAT (XFS_AT_TYPE|XFS_AT_MODE|XFS_AT_UID|XFS_AT_GID|\
XFS_AT_FSID|XFS_AT_NODEID|XFS_AT_NLINK|XFS_AT_SIZE|\
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/quota/xfs_qm_syscalls.c
---- linux-2.6.18.1/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/quota/xfs_qm_syscalls.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/quota/xfs_qm_syscalls.c
+--- linux-2.6.18.2/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/quota/xfs_qm_syscalls.c 2006-09-20 17:01:44 +0200
@@ -213,7 +213,7 @@ xfs_qm_scall_quotaoff(
xfs_qoff_logitem_t *qoffstart;
int nculprits;
@@ -8287,9 +8306,9 @@
return XFS_ERROR(EPERM);
if ((newlim->d_fieldmask &
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_clnt.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_clnt.h
---- linux-2.6.18.1/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_clnt.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_clnt.h
+--- linux-2.6.18.2/fs/xfs/xfs_clnt.h 2006-06-18 04:54:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_clnt.h 2006-09-20 17:01:44 +0200
@@ -99,5 +99,7 @@ struct xfs_mount_args {
*/
#define XFSMNT2_COMPAT_IOSIZE 0x00000001 /* don't report large preferred
@@ -8298,9 +8317,9 @@
+
#endif /* __XFS_CLNT_H__ */
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_dinode.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_dinode.h
---- linux-2.6.18.1/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_dinode.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_dinode.h
+--- linux-2.6.18.2/fs/xfs/xfs_dinode.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_dinode.h 2006-09-20 18:30:41 +0200
@@ -53,7 +53,8 @@ typedef struct xfs_dinode_core
__uint32_t di_gid; /* owner's group id */
__uint32_t di_nlink; /* number of links to file */
@@ -8338,9 +8357,9 @@
+ XFS_DIFLAG_IUNLINK)
#endif /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_fs.h
---- linux-2.6.18.1/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_fs.h
+--- linux-2.6.18.2/fs/xfs/xfs_fs.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_fs.h 2006-09-20 18:29:07 +0200
@@ -68,6 +68,8 @@ struct fsxattr {
#define XFS_XFLAG_EXTSIZE 0x00000800 /* extent size allocator hint */
#define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */
@@ -8360,9 +8379,9 @@
__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.18.1/fs/xfs/xfs_inode.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_inode.c
---- linux-2.6.18.1/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_inode.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_inode.c
+--- linux-2.6.18.2/fs/xfs/xfs_inode.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_inode.c 2006-09-20 17:01:44 +0200
@@ -50,6 +50,7 @@
#include "xfs_mac.h"
#include "xfs_acl.h"
@@ -8428,9 +8447,9 @@
ip->i_d.di_projid = prid;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_itable.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_itable.c
---- linux-2.6.18.1/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_itable.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_itable.c
+--- linux-2.6.18.2/fs/xfs/xfs_itable.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_itable.c 2006-09-20 17:01:44 +0200
@@ -78,6 +78,7 @@ xfs_bulkstat_one_iget(
buf->bs_mode = dic->di_mode;
buf->bs_uid = dic->di_uid;
@@ -8447,9 +8466,9 @@
buf->bs_size = INT_GET(dic->di_size, ARCH_CONVERT);
buf->bs_atime.tv_sec = INT_GET(dic->di_atime.t_sec, ARCH_CONVERT);
buf->bs_atime.tv_nsec = INT_GET(dic->di_atime.t_nsec, ARCH_CONVERT);
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_mount.h
---- linux-2.6.18.1/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_mount.h linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_mount.h
+--- linux-2.6.18.2/fs/xfs/xfs_mount.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_mount.h 2006-09-20 17:01:44 +0200
@@ -460,6 +460,7 @@ typedef struct xfs_mount {
#define XFS_MOUNT_NO_PERCPU_SB (1ULL << 23) /* don't use per-cpu superblock
counters */
@@ -8458,9 +8477,9 @@
/*
* Default minimum read and write sizes.
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vfsops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vfsops.c
---- linux-2.6.18.1/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_vfsops.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_vfsops.c
+--- linux-2.6.18.2/fs/xfs/xfs_vfsops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_vfsops.c 2006-09-20 17:01:44 +0200
@@ -300,6 +300,8 @@ xfs_start_flags(
if (ap->flags2 & XFSMNT2_COMPAT_IOSIZE)
@@ -8498,9 +8517,9 @@
} else if (!strcmp(this_char, "osyncisdsync")) {
/* no-op, this is now the default */
cmn_err(CE_WARN,
-diff -NurpP --minimal linux-2.6.18.1/fs/xfs/xfs_vnodeops.c linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vnodeops.c
---- linux-2.6.18.1/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/fs/xfs/xfs_vnodeops.c linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_vnodeops.c
+--- linux-2.6.18.2/fs/xfs/xfs_vnodeops.c 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/fs/xfs/xfs_vnodeops.c 2006-09-20 17:01:44 +0200
@@ -160,6 +160,7 @@ xfs_getattr(
vap->va_mode = ip->i_d.di_mode;
vap->va_uid = ip->i_d.di_uid;
@@ -8599,9 +8618,9 @@
if (vap->va_xflags & XFS_XFLAG_APPEND)
di_flags |= XFS_DIFLAG_APPEND;
if (vap->va_xflags & XFS_XFLAG_SYNC)
-diff -NurpP --minimal linux-2.6.18.1/include/asm-arm/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm/tlb.h
---- linux-2.6.18.1/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-arm/tlb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm/tlb.h
+--- linux-2.6.18.2/include/asm-arm/tlb.h 2006-06-18 04:54:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm/tlb.h 2006-09-20 17:01:44 +0200
@@ -28,6 +28,7 @@
#else /* !CONFIG_MMU */
@@ -8610,9 +8629,9 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/tlb.h
---- linux-2.6.18.1/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-arm26/tlb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm26/tlb.h
+--- linux-2.6.18.2/include/asm-arm26/tlb.h 2006-01-03 17:30:02 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm26/tlb.h 2006-09-20 17:01:44 +0200
@@ -3,6 +3,7 @@
#include <asm/pgalloc.h>
@@ -8621,9 +8640,9 @@
/*
* TLB handling. This allows us to remove pages from the page
-diff -NurpP --minimal linux-2.6.18.1/include/asm-arm26/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/unistd.h
---- linux-2.6.18.1/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-arm26/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm26/unistd.h
+--- linux-2.6.18.2/include/asm-arm26/unistd.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-arm26/unistd.h 2006-09-20 17:01:44 +0200
@@ -302,6 +302,8 @@
#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
#define __NR_waitid (__NR_SYSCALL_BASE+280)
@@ -8633,9 +8652,9 @@
/*
* The following SWIs are ARM private. FIXME - make appropriate for arm26
*/
-diff -NurpP --minimal linux-2.6.18.1/include/asm-generic/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-generic/tlb.h
---- linux-2.6.18.1/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-generic/tlb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-generic/tlb.h
+--- linux-2.6.18.2/include/asm-generic/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-generic/tlb.h 2006-09-20 17:01:44 +0200
@@ -14,6 +14,7 @@
#define _ASM_GENERIC__TLB_H
@@ -8644,9 +8663,9 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.18.1/include/asm-i386/elf.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-i386/elf.h
---- linux-2.6.18.1/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-i386/elf.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-i386/elf.h
+--- linux-2.6.18.2/include/asm-i386/elf.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-i386/elf.h 2006-09-20 17:01:44 +0200
@@ -112,7 +112,7 @@ typedef struct user_fxsr_struct elf_fpxr
For the moment, we have only optimizations for the Intel generations,
but that could change... */
@@ -8656,9 +8675,9 @@
#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
-diff -NurpP --minimal linux-2.6.18.1/include/asm-ia64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-ia64/tlb.h
---- linux-2.6.18.1/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-ia64/tlb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-ia64/tlb.h
+--- linux-2.6.18.2/include/asm-ia64/tlb.h 2006-09-20 16:58:40 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-ia64/tlb.h 2006-09-20 17:01:44 +0200
@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/pagemap.h>
@@ -8667,9 +8686,9 @@
#include <asm/pgalloc.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.18.1/include/asm-mips/irq.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-mips/irq.h
---- linux-2.6.18.1/include/asm-mips/irq.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-mips/irq.h 2006-10-17 01:58:48 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-mips/irq.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-mips/irq.h
+--- linux-2.6.18.2/include/asm-mips/irq.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-mips/irq.h 2006-10-17 01:58:48 +0200
@@ -57,9 +57,13 @@ do { \
*/
#define do_IRQ(irq, regs) \
@@ -8684,9 +8703,9 @@
irq_exit(); \
} while (0)
-diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/systbl.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/systbl.h
---- linux-2.6.18.1/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-powerpc/systbl.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-powerpc/systbl.h
+--- linux-2.6.18.2/include/asm-powerpc/systbl.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-powerpc/systbl.h 2006-09-20 20:01:36 +0200
@@ -260,7 +260,7 @@ COMPAT_SYS_SPU(fstatfs64)
SYSX(sys_ni_syscall, ppc_fadvise64_64, ppc_fadvise64_64)
PPC_SYS_SPU(rtas)
@@ -8696,9 +8715,9 @@
SYSCALL(ni_syscall)
COMPAT_SYS(mbind)
COMPAT_SYS(get_mempolicy)
-diff -NurpP --minimal linux-2.6.18.1/include/asm-powerpc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/unistd.h
---- linux-2.6.18.1/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-powerpc/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-powerpc/unistd.h
+--- linux-2.6.18.2/include/asm-powerpc/unistd.h 2006-09-20 16:58:41 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-powerpc/unistd.h 2006-09-20 17:01:44 +0200
@@ -275,7 +275,7 @@
#endif
#define __NR_rtas 255
@@ -8708,9 +8727,9 @@
/* 258 currently unused */
#define __NR_mbind 259
#define __NR_get_mempolicy 260
-diff -NurpP --minimal linux-2.6.18.1/include/asm-s390/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-s390/unistd.h
---- linux-2.6.18.1/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-s390/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-s390/unistd.h
+--- linux-2.6.18.2/include/asm-s390/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-s390/unistd.h 2006-09-20 17:01:44 +0200
@@ -255,7 +255,7 @@
#define __NR_clock_gettime (__NR_timer_create+6)
#define __NR_clock_getres (__NR_timer_create+7)
@@ -8720,9 +8739,9 @@
#define __NR_fadvise64_64 264
#define __NR_statfs64 265
#define __NR_fstatfs64 266
-diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc/unistd.h
---- linux-2.6.18.1/include/asm-sparc/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc/unistd.h
+--- linux-2.6.18.2/include/asm-sparc/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc/unistd.h 2006-09-20 17:01:44 +0200
@@ -283,7 +283,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8732,9 +8751,9 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/tlb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/tlb.h
---- linux-2.6.18.1/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc64/tlb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc64/tlb.h
+--- linux-2.6.18.2/include/asm-sparc64/tlb.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc64/tlb.h 2006-09-20 17:01:44 +0200
@@ -2,6 +2,7 @@
#define _SPARC64_TLB_H
@@ -8743,9 +8762,9 @@
#include <asm/pgalloc.h>
#include <asm/tlbflush.h>
#include <asm/mmu_context.h>
-diff -NurpP --minimal linux-2.6.18.1/include/asm-sparc64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/unistd.h
---- linux-2.6.18.1/include/asm-sparc64/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-sparc64/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc64/unistd.h
+--- linux-2.6.18.2/include/asm-sparc64/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-sparc64/unistd.h 2006-09-20 17:01:44 +0200
@@ -285,7 +285,7 @@
#define __NR_timer_getoverrun 264
#define __NR_timer_delete 265
@@ -8755,9 +8774,9 @@
#define __NR_io_setup 268
#define __NR_io_destroy 269
#define __NR_io_submit 270
-diff -NurpP --minimal linux-2.6.18.1/include/asm-x86_64/unistd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-x86_64/unistd.h
---- linux-2.6.18.1/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/asm-x86_64/unistd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-x86_64/unistd.h
+--- linux-2.6.18.2/include/asm-x86_64/unistd.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/asm-x86_64/unistd.h 2006-09-20 17:01:44 +0200
@@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
#define __NR_utimes 235
__SYSCALL(__NR_utimes, sys_utimes)
@@ -8767,9 +8786,9 @@
#define __NR_mbind 237
__SYSCALL(__NR_mbind, sys_mbind)
#define __NR_set_mempolicy 238
-diff -NurpP --minimal linux-2.6.18.1/include/linux/capability.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/capability.h
---- linux-2.6.18.1/include/linux/capability.h 2006-06-18 04:55:15 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/capability.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/capability.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/capability.h
+--- linux-2.6.18.2/include/linux/capability.h 2006-06-18 04:55:15 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/capability.h 2006-09-20 17:01:45 +0200
@@ -235,6 +235,7 @@ typedef __u32 kernel_cap_t;
arbitrary SCSI commands */
/* Allow setting encryption key on loopback filesystem */
@@ -8790,9 +8809,9 @@
#ifdef __KERNEL__
/*
* Bounding set
-diff -NurpP --minimal linux-2.6.18.1/include/linux/devpts_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/devpts_fs.h
---- linux-2.6.18.1/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/devpts_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/devpts_fs.h
+--- linux-2.6.18.2/include/linux/devpts_fs.h 2004-08-14 12:55:59 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/devpts_fs.h 2006-09-20 17:01:45 +0200
@@ -30,5 +30,7 @@ static inline void devpts_pty_kill(int n
#endif
@@ -8801,9 +8820,9 @@
+
#endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/ext2_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext2_fs.h
---- linux-2.6.18.1/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/ext2_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ext2_fs.h
+--- linux-2.6.18.2/include/linux/ext2_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ext2_fs.h 2006-09-20 17:01:45 +0200
@@ -192,10 +192,17 @@ struct ext2_group_desc
#define EXT2_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT2_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -8851,9 +8870,9 @@
#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-2.6.18.1/include/linux/ext3_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext3_fs.h
---- linux-2.6.18.1/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/ext3_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ext3_fs.h
+--- linux-2.6.18.2/include/linux/ext3_fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ext3_fs.h 2006-09-20 17:01:45 +0200
@@ -181,10 +181,20 @@ struct ext3_group_desc
#define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
@@ -8908,9 +8927,9 @@
extern void ext3_read_inode (struct inode *);
extern int ext3_write_inode (struct inode *, int);
-diff -NurpP --minimal linux-2.6.18.1/include/linux/fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/fs.h
---- linux-2.6.18.1/include/linux/fs.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/fs.h
+--- linux-2.6.18.2/include/linux/fs.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/fs.h 2006-09-20 17:01:45 +0200
@@ -119,6 +119,8 @@ extern int dir_notify_enable;
#define MS_PRIVATE (1<<18) /* change to private */
#define MS_SLAVE (1<<19) /* change to slave */
@@ -9038,9 +9057,9 @@
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.18.1/include/linux/init_task.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/init_task.h
---- linux-2.6.18.1/include/linux/init_task.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/init_task.h 2006-09-20 17:51:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/init_task.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/init_task.h
+--- linux-2.6.18.2/include/linux/init_task.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/init_task.h 2006-09-20 17:51:11 +0200
@@ -128,6 +128,10 @@ extern struct group_info init_groups;
.pi_lock = SPIN_LOCK_UNLOCKED, \
INIT_TRACE_IRQFLAGS \
@@ -9052,9 +9071,9 @@
}
-diff -NurpP --minimal linux-2.6.18.1/include/linux/ipc.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ipc.h
---- linux-2.6.18.1/include/linux/ipc.h 2004-08-14 12:54:46 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/ipc.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/ipc.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ipc.h
+--- linux-2.6.18.2/include/linux/ipc.h 2004-08-14 12:54:46 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/ipc.h 2006-09-20 17:01:45 +0200
@@ -66,6 +66,7 @@ struct kern_ipc_perm
mode_t mode;
unsigned long seq;
@@ -9063,9 +9082,9 @@
};
#endif /* __KERNEL__ */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/kernel.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/kernel.h
---- linux-2.6.18.1/include/linux/kernel.h 2006-09-20 16:58:43 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/kernel.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/kernel.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/kernel.h
+--- linux-2.6.18.2/include/linux/kernel.h 2006-09-20 16:58:43 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/kernel.h 2006-09-20 17:01:45 +0200
@@ -17,6 +17,7 @@
#include <asm/bug.h>
@@ -9074,9 +9093,9 @@
#define INT_MAX ((int)(~0U>>1))
#define INT_MIN (-INT_MAX - 1)
-diff -NurpP --minimal linux-2.6.18.1/include/linux/major.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/major.h
---- linux-2.6.18.1/include/linux/major.h 2006-06-18 04:55:19 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/major.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/major.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/major.h
+--- linux-2.6.18.2/include/linux/major.h 2006-06-18 04:55:19 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/major.h 2006-09-20 17:01:45 +0200
@@ -15,6 +15,7 @@
#define HD_MAJOR IDE0_MAJOR
#define PTY_SLAVE_MAJOR 3
@@ -9085,9 +9104,9 @@
#define TTYAUX_MAJOR 5
#define LP_MAJOR 6
#define VCS_MAJOR 7
-diff -NurpP --minimal linux-2.6.18.1/include/linux/mount.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/mount.h
---- linux-2.6.18.1/include/linux/mount.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/mount.h 2006-09-20 17:50:23 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/mount.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/mount.h
+--- linux-2.6.18.2/include/linux/mount.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/mount.h 2006-09-20 17:50:23 +0200
@@ -27,12 +27,16 @@ struct namespace;
#define MNT_NOEXEC 0x04
#define MNT_NOATIME 0x08
@@ -9113,9 +9132,9 @@
};
static inline struct vfsmount *mntget(struct vfsmount *mnt)
-diff -NurpP --minimal linux-2.6.18.1/include/linux/net.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/net.h
---- linux-2.6.18.1/include/linux/net.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/net.h 2006-09-20 17:47:13 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/net.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/net.h
+--- linux-2.6.18.2/include/linux/net.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/net.h 2006-09-20 17:47:13 +0200
@@ -62,6 +62,7 @@ typedef enum {
#define SOCK_NOSPACE 2
#define SOCK_PASSCRED 3
@@ -9124,9 +9143,9 @@
#ifndef ARCH_HAS_SOCKET_TYPES
/**
-diff -NurpP --minimal linux-2.6.18.1/include/linux/nfs_mount.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/nfs_mount.h
---- linux-2.6.18.1/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/nfs_mount.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/nfs_mount.h
+--- linux-2.6.18.2/include/linux/nfs_mount.h 2005-08-29 22:25:42 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/nfs_mount.h 2006-09-20 17:01:45 +0200
@@ -61,6 +61,7 @@ struct nfs_mount_data {
#define NFS_MOUNT_NOACL 0x0800 /* 4 */
#define NFS_MOUNT_STRICTLOCK 0x1000 /* reserved for NFSv4 */
@@ -9135,9 +9154,9 @@
#define NFS_MOUNT_FLAGMASK 0xFFFF
#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/percpu.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/percpu.h
---- linux-2.6.18.1/include/linux/percpu.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/percpu.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/percpu.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/percpu.h
+--- linux-2.6.18.2/include/linux/percpu.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/percpu.h 2006-09-20 17:01:45 +0200
@@ -8,7 +8,7 @@
/* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
@@ -9147,9 +9166,9 @@
#endif
/* Must be an lvalue. */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/pid.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/pid.h
---- linux-2.6.18.1/include/linux/pid.h 2006-06-18 04:55:21 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/pid.h 2006-10-17 01:48:03 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/pid.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/pid.h
+--- linux-2.6.18.2/include/linux/pid.h 2006-06-18 04:55:21 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/pid.h 2006-10-17 01:48:03 +0200
@@ -8,7 +8,8 @@ enum pid_type
PIDTYPE_PID,
PIDTYPE_PGID,
@@ -9160,9 +9179,9 @@
};
/*
-diff -NurpP --minimal linux-2.6.18.1/include/linux/proc_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/proc_fs.h
---- linux-2.6.18.1/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/proc_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/proc_fs.h
+--- linux-2.6.18.2/include/linux/proc_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/proc_fs.h 2006-09-20 17:46:14 +0200
@@ -55,6 +55,7 @@ struct proc_dir_entry {
nlink_t nlink;
uid_t uid;
@@ -9184,9 +9203,9 @@
} op;
struct proc_dir_entry *pde;
struct inode vfs_inode;
-diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs.h
---- linux-2.6.18.1/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/reiserfs_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/reiserfs_fs.h
+--- linux-2.6.18.2/include/linux/reiserfs_fs.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/reiserfs_fs.h 2006-09-20 17:01:45 +0200
@@ -829,6 +829,18 @@ struct stat_data_v1 {
#define REISERFS_COMPR_FL EXT2_COMPR_FL
#define REISERFS_NOTAIL_FL EXT2_NOTAIL_FL
@@ -9214,9 +9233,9 @@
/* namei.c */
void set_de_name_and_namelen(struct reiserfs_dir_entry *de);
-diff -NurpP --minimal linux-2.6.18.1/include/linux/reiserfs_fs_sb.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.18.1/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/reiserfs_fs_sb.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.18.2/include/linux/reiserfs_fs_sb.h 2006-02-18 14:40:35 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/reiserfs_fs_sb.h 2006-09-20 17:01:45 +0200
@@ -456,6 +456,7 @@ enum reiserfs_mount_options {
REISERFS_POSIXACL,
REISERFS_BARRIER_NONE,
@@ -9225,9 +9244,9 @@
/* Actions on error */
REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-2.6.18.1/include/linux/sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sched.h
---- linux-2.6.18.1/include/linux/sched.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sched.h 2006-10-17 01:48:03 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/sched.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sched.h
+--- linux-2.6.18.2/include/linux/sched.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sched.h 2006-10-17 01:48:03 +0200
@@ -52,6 +52,7 @@ struct sched_param {
#include <linux/cpumask.h>
#include <linux/errno.h>
@@ -9341,9 +9360,9 @@
static inline struct user_struct *get_uid(struct user_struct *u)
{
atomic_inc(&u->__count);
-diff -NurpP --minimal linux-2.6.18.1/include/linux/shmem_fs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/shmem_fs.h
---- linux-2.6.18.1/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/shmem_fs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/shmem_fs.h
+--- linux-2.6.18.2/include/linux/shmem_fs.h 2006-04-09 13:49:57 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/shmem_fs.h 2006-09-20 17:01:45 +0200
@@ -8,6 +8,9 @@
#define SHMEM_NR_DIRECT 16
@@ -9354,9 +9373,9 @@
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
-diff -NurpP --minimal linux-2.6.18.1/include/linux/stat.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/stat.h
---- linux-2.6.18.1/include/linux/stat.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/stat.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/stat.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/stat.h
+--- linux-2.6.18.2/include/linux/stat.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/stat.h 2006-09-20 17:01:45 +0200
@@ -63,6 +63,7 @@ struct kstat {
unsigned int nlink;
uid_t uid;
@@ -9365,9 +9384,9 @@
dev_t rdev;
loff_t size;
struct timespec atime;
-diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/auth.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/auth.h
---- linux-2.6.18.1/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/sunrpc/auth.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sunrpc/auth.h
+--- linux-2.6.18.2/include/linux/sunrpc/auth.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sunrpc/auth.h 2006-09-20 17:01:45 +0200
@@ -27,6 +27,7 @@
struct auth_cred {
uid_t uid;
@@ -9376,9 +9395,9 @@
struct group_info *group_info;
};
-diff -NurpP --minimal linux-2.6.18.1/include/linux/sunrpc/clnt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/clnt.h
---- linux-2.6.18.1/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/sunrpc/clnt.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sunrpc/clnt.h
+--- linux-2.6.18.2/include/linux/sunrpc/clnt.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sunrpc/clnt.h 2006-09-20 17:01:45 +0200
@@ -52,7 +52,8 @@ struct rpc_clnt {
cl_intr : 1,/* interruptible */
cl_autobind : 1,/* use getport() */
@@ -9389,9 +9408,9 @@
struct rpc_rtt * cl_rtt; /* RTO estimator data */
struct rpc_portmap * cl_pmap; /* port mapping */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/sysctl.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysctl.h
---- linux-2.6.18.1/include/linux/sysctl.h 2006-10-17 03:21:24 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysctl.h 2006-10-16 18:56:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/sysctl.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sysctl.h
+--- linux-2.6.18.2/include/linux/sysctl.h 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sysctl.h 2006-10-16 18:56:11 +0200
@@ -93,6 +93,7 @@ enum
KERN_CAP_BSET=14, /* int: capability bounding set */
KERN_PANIC=15, /* int: panic timeout */
@@ -9418,9 +9437,9 @@
ctl_handler *strategy; /* Callback function for all r/w */
struct proc_dir_entry *de; /* /proc control block */
void *extra1;
-diff -NurpP --minimal linux-2.6.18.1/include/linux/sysfs.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysfs.h
---- linux-2.6.18.1/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/sysfs.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sysfs.h
+--- linux-2.6.18.2/include/linux/sysfs.h 2006-06-18 04:55:25 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/sysfs.h 2006-09-20 17:01:45 +0200
@@ -12,6 +12,8 @@
#include <asm/atomic.h>
@@ -9430,9 +9449,9 @@
struct kobject;
struct module;
-diff -NurpP --minimal linux-2.6.18.1/include/linux/types.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/types.h
---- linux-2.6.18.1/include/linux/types.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/types.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/types.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/types.h
+--- linux-2.6.18.2/include/linux/types.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/types.h 2006-09-20 17:01:45 +0200
@@ -37,6 +37,8 @@ typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
@@ -9442,9 +9461,9 @@
#ifdef CONFIG_UID16
/* This is defined by include/asm-{arch}/posix_types.h */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vroot.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vroot.h
---- linux-2.6.18.1/include/linux/vroot.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vroot.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vroot.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vroot.h
+--- linux-2.6.18.2/include/linux/vroot.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vroot.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,51 @@
+
+/*
@@ -9497,9 +9516,9 @@
+#define VROOT_CLR_DEV 0x5601
+
+#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_base.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_base.h
---- linux-2.6.18.1/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_base.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_base.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_base.h
+--- linux-2.6.18.2/include/linux/vs_base.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_base.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,106 @@
+#ifndef _VX_VS_BASE_H
+#define _VX_VS_BASE_H
@@ -9607,9 +9626,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_context.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_context.h
---- linux-2.6.18.1/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_context.h 2006-10-20 02:33:00 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_context.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_context.h
+--- linux-2.6.18.2/include/linux/vs_context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_context.h 2006-11-06 05:08:58 +0100
@@ -0,0 +1,242 @@
+#ifndef _VX_VS_CONTEXT_H
+#define _VX_VS_CONTEXT_H
@@ -9853,9 +9872,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_cvirt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_cvirt.h
---- linux-2.6.18.1/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_cvirt.h 2006-10-25 03:48:07 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_cvirt.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_cvirt.h
+--- linux-2.6.18.2/include/linux/vs_cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_cvirt.h 2006-10-25 03:48:07 +0200
@@ -0,0 +1,158 @@
+#ifndef _VX_VS_CVIRT_H
+#define _VX_VS_CVIRT_H
@@ -10015,9 +10034,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_dlimit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_dlimit.h
---- linux-2.6.18.1/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_dlimit.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_dlimit.h
+--- linux-2.6.18.2/include/linux/vs_dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_dlimit.h 2006-10-16 19:04:59 +0200
@@ -0,0 +1,213 @@
+#ifndef _VX_VS_DLIMIT_H
+#define _VX_VS_DLIMIT_H
@@ -10232,9 +10251,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_limit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_limit.h
---- linux-2.6.18.1/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_limit.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_limit.h
+--- linux-2.6.18.2/include/linux/vs_limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_limit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,107 @@
+#ifndef _VX_VS_LIMIT_H
+#define _VX_VS_LIMIT_H
@@ -10343,9 +10362,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_memory.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_memory.h
---- linux-2.6.18.1/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_memory.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_memory.h
+--- linux-2.6.18.2/include/linux/vs_memory.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_memory.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,107 @@
+#ifndef _VX_VS_MEMORY_H
+#define _VX_VS_MEMORY_H
@@ -10454,9 +10473,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_network.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_network.h
---- linux-2.6.18.1/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_network.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_network.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_network.h
+--- linux-2.6.18.2/include/linux/vs_network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_network.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,215 @@
+#ifndef _NX_VS_NETWORK_H
+#define _NX_VS_NETWORK_H
@@ -10673,9 +10692,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_sched.h
---- linux-2.6.18.1/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_sched.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_sched.h
+--- linux-2.6.18.2/include/linux/vs_sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_sched.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,92 @@
+#ifndef _VX_VS_SCHED_H
+#define _VX_VS_SCHED_H
@@ -10769,9 +10788,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vs_socket.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_socket.h
---- linux-2.6.18.1/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vs_socket.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_socket.h
+--- linux-2.6.18.2/include/linux/vs_socket.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vs_socket.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,57 @@
+#ifndef _VX_VS_SOCKET_H
+#define _VX_VS_SOCKET_H
@@ -10830,9 +10849,9 @@
+#else
+#warning duplicate inclusion
+#endif
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context.h
---- linux-2.6.18.1/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context.h 2006-10-17 02:05:58 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/context.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/context.h
+--- linux-2.6.18.2/include/linux/vserver/context.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/context.h 2006-10-17 02:05:58 +0200
@@ -0,0 +1,178 @@
+#ifndef _VX_CONTEXT_H
+#define _VX_CONTEXT_H
@@ -11012,9 +11031,9 @@
+#else /* _VX_CONTEXT_H */
+#warning duplicate inclusion
+#endif /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/context_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context_cmd.h
---- linux-2.6.18.1/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/context_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/context_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/context_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,84 @@
+#ifndef _VX_CONTEXT_CMD_H
+#define _VX_CONTEXT_CMD_H
@@ -11100,9 +11119,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt.h
---- linux-2.6.18.1/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt.h
+--- linux-2.6.18.2/include/linux/vserver/cvirt.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_CVIRT_H
+#define _VX_CVIRT_H
@@ -11130,9 +11149,9 @@
+#else /* _VX_CVIRT_H */
+#warning duplicate inclusion
+#endif /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_cmd.h
---- linux-2.6.18.1/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,35 @@
+#ifndef _VX_CVIRT_CMD_H
+#define _VX_CVIRT_CMD_H
@@ -11169,9 +11188,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/cvirt_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_def.h
---- linux-2.6.18.1/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/cvirt_def.h 2006-10-20 03:12:44 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/cvirt_def.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt_def.h
+--- linux-2.6.18.2/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/cvirt_def.h 2006-10-20 03:12:44 +0200
@@ -0,0 +1,75 @@
+#ifndef _VX_CVIRT_DEF_H
+#define _VX_CVIRT_DEF_H
@@ -11248,9 +11267,9 @@
+};
+
+#endif /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug.h
---- linux-2.6.18.1/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/debug.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/debug.h
+--- linux-2.6.18.2/include/linux/vserver/debug.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/debug.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,298 @@
+#ifndef _VX_DEBUG_H
+#define _VX_DEBUG_H
@@ -11550,9 +11569,9 @@
+
+
+#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/debug_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug_cmd.h
---- linux-2.6.18.1/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/debug_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/debug_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/debug_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/debug_cmd.h 2006-11-06 05:08:58 +0100
@@ -0,0 +1,14 @@
+#ifndef _VX_DEBUG_CMD_H
+#define _VX_DEBUG_CMD_H
@@ -11568,9 +11587,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit.h
---- linux-2.6.18.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/dlimit.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/dlimit.h
+--- linux-2.6.18.2/include/linux/vserver/dlimit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/dlimit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,53 @@
+#ifndef _VX_DLIMIT_H
+#define _VX_DLIMIT_H
@@ -11625,9 +11644,9 @@
+#else /* _VX_DLIMIT_H */
+#warning duplicate inclusion
+#endif /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit_cmd.h
---- linux-2.6.18.1/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/dlimit_cmd.h 2006-10-29 03:10:06 +0100
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/dlimit_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/dlimit_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/dlimit_cmd.h 2006-11-06 05:31:43 +0100
@@ -0,0 +1,71 @@
+#ifndef _VX_DLIMIT_CMD_H
+#define _VX_DLIMIT_CMD_H
@@ -11700,9 +11719,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode.h
---- linux-2.6.18.1/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/inode.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/inode.h
+--- linux-2.6.18.2/include/linux/vserver/inode.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/inode.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_INODE_H
+#define _VX_INODE_H
@@ -11742,9 +11761,9 @@
+#else /* _VX_INODE_H */
+#warning duplicate inclusion
+#endif /* _VX_INODE_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/inode_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode_cmd.h
---- linux-2.6.18.1/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/inode_cmd.h 2006-10-29 03:10:06 +0100
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/inode_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/inode_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/inode_cmd.h 2006-11-06 05:31:43 +0100
@@ -0,0 +1,61 @@
+#ifndef _VX_INODE_CMD_H
+#define _VX_INODE_CMD_H
@@ -11807,9 +11826,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/legacy.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/legacy.h
---- linux-2.6.18.1/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/legacy.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/legacy.h
+--- linux-2.6.18.2/include/linux/vserver/legacy.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/legacy.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,49 @@
+#ifndef _VX_LEGACY_H
+#define _VX_LEGACY_H
@@ -11860,9 +11879,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LEGACY_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit.h
---- linux-2.6.18.1/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit.h
+--- linux-2.6.18.2/include/linux/vserver/limit.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,20 @@
+#ifndef _VX_LIMIT_H
+#define _VX_LIMIT_H
@@ -11884,9 +11903,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_cmd.h
---- linux-2.6.18.1/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,55 @@
+#ifndef _VX_LIMIT_CMD_H
+#define _VX_LIMIT_CMD_H
@@ -11943,9 +11962,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_def.h
---- linux-2.6.18.1/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_def.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_def.h
+--- linux-2.6.18.2/include/linux/vserver/limit_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_def.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,22 @@
+#ifndef _VX_LIMIT_DEF_H
+#define _VX_LIMIT_DEF_H
@@ -11969,9 +11988,9 @@
+
+
+#endif /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/limit_int.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_int.h
---- linux-2.6.18.1/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/limit_int.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_int.h
+--- linux-2.6.18.2/include/linux/vserver/limit_int.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/limit_int.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,76 @@
+#ifndef _VX_LIMIT_INT_H
+#define _VX_LIMIT_INT_H
@@ -12049,9 +12068,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace.h
---- linux-2.6.18.1/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/namespace.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/namespace.h
+--- linux-2.6.18.2/include/linux/vserver/namespace.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/namespace.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,15 @@
+#ifndef _VX_NAMESPACE_H
+#define _VX_NAMESPACE_H
@@ -12068,9 +12087,9 @@
+#else /* _VX_NAMESPACE_H */
+#warning duplicate inclusion
+#endif /* _VX_NAMESPACE_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/namespace_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace_cmd.h
---- linux-2.6.18.1/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/namespace_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/namespace_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/namespace_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/namespace_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,17 @@
+#ifndef _VX_NAMESPACE_CMD_H
+#define _VX_NAMESPACE_CMD_H
@@ -12089,9 +12108,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_NAMESPACE_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network.h
---- linux-2.6.18.1/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/network.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/network.h
+--- linux-2.6.18.2/include/linux/vserver/network.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/network.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,119 @@
+#ifndef _VX_NETWORK_H
+#define _VX_NETWORK_H
@@ -12212,9 +12231,9 @@
+#else /* _VX_NETWORK_H */
+#warning duplicate inclusion
+#endif /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/network_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network_cmd.h
---- linux-2.6.18.1/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/network_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/network_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/network_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,89 @@
+#ifndef _VX_NETWORK_CMD_H
+#define _VX_NETWORK_CMD_H
@@ -12305,9 +12324,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched.h
---- linux-2.6.18.1/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched.h
+--- linux-2.6.18.2/include/linux/vserver/sched.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SCHED_H
+#define _VX_SCHED_H
@@ -12335,9 +12354,9 @@
+#else /* _VX_SCHED_H */
+#warning duplicate inclusion
+#endif /* _VX_SCHED_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_cmd.h
---- linux-2.6.18.1/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,48 @@
+#ifndef _VX_SCHED_CMD_H
+#define _VX_SCHED_CMD_H
@@ -12387,9 +12406,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/sched_def.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_def.h
---- linux-2.6.18.1/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/sched_def.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched_def.h
+--- linux-2.6.18.2/include/linux/vserver/sched_def.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/sched_def.h 2006-10-20 00:46:11 +0200
@@ -0,0 +1,38 @@
+#ifndef _VX_SCHED_DEF_H
+#define _VX_SCHED_DEF_H
@@ -12429,9 +12448,9 @@
+};
+
+#endif /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal.h
---- linux-2.6.18.1/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/signal.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/signal.h
+--- linux-2.6.18.2/include/linux/vserver/signal.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/signal.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,14 @@
+#ifndef _VX_SIGNAL_H
+#define _VX_SIGNAL_H
@@ -12447,9 +12466,9 @@
+#else /* _VX_SIGNAL_H */
+#warning duplicate inclusion
+#endif /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/signal_cmd.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal_cmd.h
---- linux-2.6.18.1/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/signal_cmd.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/signal_cmd.h
+--- linux-2.6.18.2/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/signal_cmd.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,26 @@
+#ifndef _VX_SIGNAL_CMD_H
+#define _VX_SIGNAL_CMD_H
@@ -12477,9 +12496,9 @@
+
+#endif /* __KERNEL__ */
+#endif /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/switch.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/switch.h
---- linux-2.6.18.1/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/switch.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/switch.h
+--- linux-2.6.18.2/include/linux/vserver/switch.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/switch.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,98 @@
+#ifndef _VX_SWITCH_H
+#define _VX_SWITCH_H
@@ -12579,9 +12598,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _VX_SWITCH_H */
-diff -NurpP --minimal linux-2.6.18.1/include/linux/vserver/xid.h linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/xid.h
---- linux-2.6.18.1/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100
+diff -NurpP --minimal linux-2.6.18.2/include/linux/vserver/xid.h linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/xid.h
+--- linux-2.6.18.2/include/linux/vserver/xid.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/linux/vserver/xid.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,144 @@
+#ifndef _VX_XID_H
+#define _VX_XID_H
@@ -12727,9 +12746,9 @@
+void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
+#endif /* _VX_XID_H */
-diff -NurpP --minimal linux-2.6.18.1/include/net/af_unix.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/af_unix.h
---- linux-2.6.18.1/include/net/af_unix.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/af_unix.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/af_unix.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/af_unix.h
+--- linux-2.6.18.2/include/net/af_unix.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/af_unix.h 2006-09-20 17:01:45 +0200
@@ -17,9 +17,9 @@ extern spinlock_t unix_table_lock;
extern atomic_t unix_tot_inflight;
@@ -12772,9 +12791,9 @@
}
#define forall_unix_sockets(i, s) \
-diff -NurpP --minimal linux-2.6.18.1/include/net/inet_hashtables.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_hashtables.h
---- linux-2.6.18.1/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/inet_hashtables.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_hashtables.h
+--- linux-2.6.18.2/include/net/inet_hashtables.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_hashtables.h 2006-09-20 17:01:45 +0200
@@ -271,6 +271,25 @@ static inline int inet_iif(const struct
return ((struct rtable *)skb->dst)->rt_iif;
}
@@ -12810,9 +12829,9 @@
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
-diff -NurpP --minimal linux-2.6.18.1/include/net/inet_sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_sock.h
---- linux-2.6.18.1/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_sock.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/inet_sock.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_sock.h
+--- linux-2.6.18.2/include/net/inet_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_sock.h 2006-09-20 17:01:45 +0200
@@ -114,6 +114,7 @@ struct inet_sock {
/* Socket demultiplex comparisons on incoming packets. */
__u32 daddr;
@@ -12821,9 +12840,9 @@
__u16 dport;
__u16 num;
__u32 saddr;
-diff -NurpP --minimal linux-2.6.18.1/include/net/inet_timewait_sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_timewait_sock.h
---- linux-2.6.18.1/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/inet_timewait_sock.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_timewait_sock.h
+--- linux-2.6.18.2/include/net/inet_timewait_sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/inet_timewait_sock.h 2006-09-20 17:01:45 +0200
@@ -115,6 +115,10 @@ struct inet_timewait_sock {
#define tw_refcnt __tw_common.skc_refcnt
#define tw_hash __tw_common.skc_hash
@@ -12835,9 +12854,9 @@
volatile unsigned char tw_substate;
/* 3 bits hole, try to pack */
unsigned char tw_rcv_wscale;
-diff -NurpP --minimal linux-2.6.18.1/include/net/route.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/route.h
---- linux-2.6.18.1/include/net/route.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/route.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/route.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/route.h
+--- linux-2.6.18.2/include/net/route.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/route.h 2006-09-20 17:01:45 +0200
@@ -27,11 +27,14 @@
#include <net/dst.h>
#include <net/inetpeer.h>
@@ -12942,9 +12961,9 @@
err = __ip_route_output_key(rp, &fl);
if (err)
return err;
-diff -NurpP --minimal linux-2.6.18.1/include/net/sock.h linux-2.6.18.1-vs2.0.2.2-rc4/include/net/sock.h
---- linux-2.6.18.1/include/net/sock.h 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/include/net/sock.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/include/net/sock.h linux-2.6.18.2-vs2.0.2.2-rc5/include/net/sock.h
+--- linux-2.6.18.2/include/net/sock.h 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/include/net/sock.h 2006-09-20 17:01:45 +0200
@@ -118,6 +118,10 @@ struct sock_common {
atomic_t skc_refcnt;
unsigned int skc_hash;
@@ -12967,9 +12986,10 @@
unsigned char sk_shutdown : 2,
sk_no_check : 2,
sk_userlocks : 4;
-diff -NurpP --minimal linux-2.6.18.1/ipc/mqueue.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/mqueue.c
---- linux-2.6.18.1/ipc/mqueue.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/mqueue.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/init/version.c linux-2.6.18.2-vs2.0.2.2-rc5/init/version.c
+diff -NurpP --minimal linux-2.6.18.2/ipc/mqueue.c linux-2.6.18.2-vs2.0.2.2-rc5/ipc/mqueue.c
+--- linux-2.6.18.2/ipc/mqueue.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/ipc/mqueue.c 2006-09-20 17:01:45 +0200
@@ -29,6 +29,8 @@
#include <linux/audit.h>
#include <linux/signal.h>
@@ -13025,9 +13045,9 @@
out_err:
dput(dentry);
-diff -NurpP --minimal linux-2.6.18.1/ipc/msg.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/msg.c
---- linux-2.6.18.1/ipc/msg.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/msg.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/ipc/msg.c linux-2.6.18.2-vs2.0.2.2-rc5/ipc/msg.c
+--- linux-2.6.18.2/ipc/msg.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/ipc/msg.c 2006-09-20 17:01:45 +0200
@@ -103,6 +103,7 @@ static int newque(key_t key, int msgflg)
msq->q_perm.mode = msgflg & S_IRWXUGO;
@@ -13046,9 +13066,9 @@
return seq_printf(s,
"%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
msq->q_perm.key,
-diff -NurpP --minimal linux-2.6.18.1/ipc/sem.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/sem.c
---- linux-2.6.18.1/ipc/sem.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/sem.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/ipc/sem.c linux-2.6.18.2-vs2.0.2.2-rc5/ipc/sem.c
+--- linux-2.6.18.2/ipc/sem.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/ipc/sem.c 2006-09-20 17:01:45 +0200
@@ -183,6 +183,7 @@ static int newary (key_t key, int nsems,
sma->sem_perm.mode = (semflg & S_IRWXUGO);
@@ -13067,9 +13087,9 @@
return seq_printf(s,
"%10d %10d %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
sma->sem_perm.key,
-diff -NurpP --minimal linux-2.6.18.1/ipc/shm.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/shm.c
---- linux-2.6.18.1/ipc/shm.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/shm.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/ipc/shm.c linux-2.6.18.2-vs2.0.2.2-rc5/ipc/shm.c
+--- linux-2.6.18.2/ipc/shm.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/ipc/shm.c 2006-09-20 17:01:45 +0200
@@ -32,6 +32,8 @@
#include <linux/ptrace.h>
#include <linux/seq_file.h>
@@ -13135,9 +13155,9 @@
if (sizeof(size_t) <= sizeof(int))
format = SMALL_STRING;
else
-diff -NurpP --minimal linux-2.6.18.1/ipc/util.c linux-2.6.18.1-vs2.0.2.2-rc4/ipc/util.c
---- linux-2.6.18.1/ipc/util.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/ipc/util.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/ipc/util.c linux-2.6.18.2-vs2.0.2.2-rc5/ipc/util.c
+--- linux-2.6.18.2/ipc/util.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/ipc/util.c 2006-09-20 17:01:45 +0200
@@ -157,7 +157,9 @@ int ipc_findkey(struct ipc_ids* ids, key
*/
for (id = 0; id <= max_id; id++) {
@@ -13159,9 +13179,9 @@
requested_mode = (flag >> 6) | (flag >> 3) | flag;
granted_mode = ipcp->mode;
if (current->euid == ipcp->cuid || current->euid == ipcp->uid)
-diff -NurpP --minimal linux-2.6.18.1/kernel/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/kernel/Makefile
---- linux-2.6.18.1/kernel/Makefile 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/Makefile 2006-09-20 17:38:59 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/Makefile linux-2.6.18.2-vs2.0.2.2-rc5/kernel/Makefile
+--- linux-2.6.18.2/kernel/Makefile 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/Makefile 2006-09-20 17:38:59 +0200
@@ -10,6 +10,8 @@ obj-y = sched.o fork.o exec_domain.o
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
hrtimer.o rwsem.o
@@ -13171,9 +13191,9 @@
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-diff -NurpP --minimal linux-2.6.18.1/kernel/capability.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/capability.c
---- linux-2.6.18.1/kernel/capability.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/capability.c 2006-10-18 01:19:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/capability.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/capability.c
+--- linux-2.6.18.2/kernel/capability.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/capability.c 2006-10-18 01:19:40 +0200
@@ -246,6 +246,9 @@ EXPORT_SYMBOL(__capable);
int capable(int cap)
@@ -13184,9 +13204,9 @@
return __capable(current, cap);
}
EXPORT_SYMBOL(capable);
-diff -NurpP --minimal linux-2.6.18.1/kernel/exit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/exit.c
---- linux-2.6.18.1/kernel/exit.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/exit.c 2006-10-20 02:23:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/exit.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/exit.c
+--- linux-2.6.18.2/kernel/exit.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/exit.c 2006-11-06 05:08:58 +0100
@@ -38,6 +38,9 @@
#include <linux/pipe_fs_i.h>
#include <linux/audit.h> /* for audit_free() */
@@ -13259,9 +13279,9 @@
/* PF_DEAD causes final put_task_struct after we schedule. */
preempt_disable();
BUG_ON(tsk->flags & PF_DEAD);
-diff -NurpP --minimal linux-2.6.18.1/kernel/fork.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/fork.c
---- linux-2.6.18.1/kernel/fork.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/fork.c 2006-09-20 17:35:08 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/fork.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/fork.c
+--- linux-2.6.18.2/kernel/fork.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/fork.c 2006-09-20 17:35:08 +0200
@@ -45,6 +45,10 @@
#include <linux/cn_proc.h>
#include <linux/delayacct.h>
@@ -13420,9 +13440,9 @@
bad_fork_free:
free_task(p);
fork_out:
-diff -NurpP --minimal linux-2.6.18.1/kernel/irq/handle.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/irq/handle.c
---- linux-2.6.18.1/kernel/irq/handle.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/irq/handle.c 2006-10-17 02:37:47 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/irq/handle.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/irq/handle.c
+--- linux-2.6.18.2/kernel/irq/handle.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/irq/handle.c 2006-11-06 05:08:58 +0100
@@ -15,6 +15,7 @@
#include <linux/random.h>
#include <linux/interrupt.h>
@@ -13431,19 +13451,15 @@
#include "internals.h"
-@@ -170,8 +171,11 @@ fastcall unsigned int __do_IRQ(unsigned
+@@ -170,6 +171,7 @@ fastcall unsigned int __do_IRQ(unsigned
{
struct irq_desc *desc = irq_desc + irq;
struct irqaction *action;
+ struct vx_info_save vxis;
unsigned int status;
-+ WARN_ON(current->xid);
-+
kstat_this_cpu.irqs[irq]++;
- if (CHECK_IRQ_PER_CPU(desc->status)) {
- irqreturn_t action_ret;
-@@ -179,14 +183,17 @@ fastcall unsigned int __do_IRQ(unsigned
+@@ -179,14 +181,17 @@ fastcall unsigned int __do_IRQ(unsigned
/*
* No locking required for CPU-local interrupts:
*/
@@ -13461,7 +13477,7 @@
if (desc->chip->ack)
desc->chip->ack(irq);
/*
-@@ -249,6 +256,7 @@ out:
+@@ -249,6 +254,7 @@ out:
* disabled while the handler was running.
*/
desc->chip->end(irq);
@@ -13469,9 +13485,9 @@
spin_unlock(&desc->lock);
return 1;
-diff -NurpP --minimal linux-2.6.18.1/kernel/kthread.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/kthread.c
---- linux-2.6.18.1/kernel/kthread.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/kthread.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/kthread.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/kthread.c
+--- linux-2.6.18.2/kernel/kthread.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/kthread.c 2006-09-20 17:01:45 +0200
@@ -123,7 +123,7 @@ static void keventd_create_kthread(void
} else {
wait_for_completion(&create->started);
@@ -13481,9 +13497,9 @@
read_unlock(&tasklist_lock);
}
complete(&create->done);
-diff -NurpP --minimal linux-2.6.18.1/kernel/pid.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/pid.c
---- linux-2.6.18.1/kernel/pid.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/pid.c 2006-10-25 03:42:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/pid.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/pid.c
+--- linux-2.6.18.2/kernel/pid.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/pid.c 2006-11-06 05:17:10 +0100
@@ -26,6 +26,7 @@
#include <linux/init.h>
#include <linux/bootmem.h>
@@ -13492,25 +13508,22 @@
#define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
static struct hlist_head *pid_hash;
-@@ -260,6 +261,17 @@ struct task_struct * fastcall pid_task(s
+@@ -260,6 +261,14 @@ struct task_struct * fastcall pid_task(s
first = rcu_dereference(pid->tasks[type].first);
if (first)
result = hlist_entry(first, struct task_struct, pids[(type)].node);
+ if (result && (pid->nr != 1) &&
+ !vx_check(vx_task_xid(result), VX_WATCH|VX_ADMIN|VX_IDENT)) {
-+ int warn = ((type == PIDTYPE_PID) && (current->xid));
-+
-+ vxwprintk(warn ,
++ vxwprintk((type == PIDTYPE_PID) && (current->xid),
+ "pid_task(%d,%d): task %p[#%u,%u] did lookup %p[#%u,%u]",
+ pid->nr, type, current, vx_current_xid(), current->pid,
+ result, vx_task_xid(result), result->pid);
-+ WARN_ON(warn);
+ result = NULL;
+ }
}
return result;
}
-@@ -269,6 +281,10 @@ struct task_struct * fastcall pid_task(s
+@@ -269,6 +278,10 @@ struct task_struct * fastcall pid_task(s
*/
struct task_struct *find_task_by_pid_type(int type, int nr)
{
@@ -13521,9 +13534,9 @@
return pid_task(find_pid(nr), type);
}
-diff -NurpP --minimal linux-2.6.18.1/kernel/posix-timers.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/posix-timers.c
---- linux-2.6.18.1/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/posix-timers.c 2006-10-17 02:39:53 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/posix-timers.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/posix-timers.c
+--- linux-2.6.18.2/kernel/posix-timers.c 2006-06-18 04:55:31 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/posix-timers.c 2006-10-17 02:39:53 +0200
@@ -48,6 +48,7 @@
#include <linux/wait.h>
#include <linux/workqueue.h>
@@ -13582,9 +13595,9 @@
rtn->tgid != current->tgid ||
(event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_SIGNAL))
return NULL;
-diff -NurpP --minimal linux-2.6.18.1/kernel/printk.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/printk.c
---- linux-2.6.18.1/kernel/printk.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/printk.c 2006-10-17 02:37:14 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/printk.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/printk.c
+--- linux-2.6.18.2/kernel/printk.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/printk.c 2006-10-17 02:37:14 +0200
@@ -31,6 +31,8 @@
#include <linux/security.h>
#include <linux/bootmem.h>
@@ -13668,9 +13681,9 @@
preempt_enable();
return printed_len;
}
-diff -NurpP --minimal linux-2.6.18.1/kernel/ptrace.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/ptrace.c
---- linux-2.6.18.1/kernel/ptrace.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/ptrace.c 2006-10-18 01:19:40 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/ptrace.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/ptrace.c
+--- linux-2.6.18.2/kernel/ptrace.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/ptrace.c 2006-10-18 01:19:40 +0200
@@ -521,6 +521,10 @@ asmlinkage long sys_ptrace(long request,
goto out;
}
@@ -13682,9 +13695,9 @@
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
goto out_put_task_struct;
-diff -NurpP --minimal linux-2.6.18.1/kernel/sched.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sched.c
---- linux-2.6.18.1/kernel/sched.c 2006-10-17 03:21:24 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sched.c 2006-10-29 03:17:14 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/sched.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sched.c
+--- linux-2.6.18.2/kernel/sched.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sched.c 2006-11-06 05:08:58 +0100
@@ -55,6 +55,9 @@
#include <asm/tlb.h>
@@ -14041,9 +14054,9 @@
__activate_task(p, task_rq(p));
resched_task(rq->curr);
}
-diff -NurpP --minimal linux-2.6.18.1/kernel/signal.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/signal.c
---- linux-2.6.18.1/kernel/signal.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/signal.c 2006-10-25 03:47:15 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/signal.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/signal.c
+--- linux-2.6.18.2/kernel/signal.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/signal.c 2006-11-06 05:08:58 +0100
@@ -571,18 +571,27 @@ static int rm_from_queue(unsigned long m
static int check_kill_permission(int sig, struct siginfo *info,
struct task_struct *t)
@@ -14105,9 +14118,9 @@
if (sig_kernel_stop(signr)) {
/*
* The default action is to stop all threads in
-diff -NurpP --minimal linux-2.6.18.1/kernel/softirq.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/softirq.c
---- linux-2.6.18.1/kernel/softirq.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/softirq.c 2006-10-17 02:35:27 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/softirq.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/softirq.c
+--- linux-2.6.18.2/kernel/softirq.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/softirq.c 2006-10-17 02:35:27 +0200
@@ -17,6 +17,7 @@
#include <linux/kthread.h>
#include <linux/rcupdate.h>
@@ -14140,9 +14153,9 @@
account_system_vtime(current);
_local_bh_enable();
}
-diff -NurpP --minimal linux-2.6.18.1/kernel/sys.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sys.c
---- linux-2.6.18.1/kernel/sys.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sys.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/sys.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sys.c
+--- linux-2.6.18.2/kernel/sys.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sys.c 2006-09-20 17:01:45 +0200
@@ -10,6 +10,7 @@
#include <linux/mman.h>
#include <linux/smp_lock.h>
@@ -14368,9 +14381,9 @@
return -EPERM;
if (resource == RLIMIT_NOFILE && new_rlim.rlim_max > NR_OPEN)
return -EPERM;
-diff -NurpP --minimal linux-2.6.18.1/kernel/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sysctl.c
---- linux-2.6.18.1/kernel/sysctl.c 2006-10-17 03:21:24 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/sysctl.c 2006-10-16 18:56:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/sysctl.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sysctl.c
+--- linux-2.6.18.2/kernel/sysctl.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/sysctl.c 2006-10-16 18:56:11 +0200
@@ -45,6 +45,7 @@
#include <linux/syscalls.h>
#include <linux/nfs_fs.h>
@@ -14500,9 +14513,9 @@
return -EFAULT;
if (len < *lenp) {
if(put_user('\n', ((char __user *) buffer) + len))
-diff -NurpP --minimal linux-2.6.18.1/kernel/timer.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/timer.c
---- linux-2.6.18.1/kernel/timer.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/timer.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/timer.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/timer.c
+--- linux-2.6.18.2/kernel/timer.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/timer.c 2006-11-06 05:08:58 +0100
@@ -34,6 +34,8 @@
#include <linux/cpu.h>
#include <linux/syscalls.h>
@@ -14568,9 +14581,9 @@
val.uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0);
val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-diff -NurpP --minimal linux-2.6.18.1/kernel/user.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/user.c
---- linux-2.6.18.1/kernel/user.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/user.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/user.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/user.c
+--- linux-2.6.18.2/kernel/user.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/user.c 2006-09-20 17:01:45 +0200
@@ -23,8 +23,8 @@
#define UIDHASH_BITS (CONFIG_BASE_SMALL ? 3 : 8)
#define UIDHASH_SZ (1 << UIDHASH_BITS)
@@ -14659,9 +14672,9 @@
spin_unlock_irq(&uidhash_lock);
return 0;
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Kconfig linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Kconfig
---- linux-2.6.18.1/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/Kconfig linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/Kconfig
+--- linux-2.6.18.2/kernel/vserver/Kconfig 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/Kconfig 2006-10-29 03:18:56 +0100
@@ -0,0 +1,189 @@
+#
+# Linux VServer configuration
@@ -14852,9 +14865,9 @@
+ depends on EXPERIMENTAL && !VSERVER_LEGACYNET
+ default y
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/Makefile linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Makefile
---- linux-2.6.18.1/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/Makefile linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/Makefile
+--- linux-2.6.18.2/kernel/vserver/Makefile 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/Makefile 2006-09-20 17:01:45 +0200
@@ -0,0 +1,16 @@
+#
+# Makefile for the Linux vserver routines.
@@ -14872,9 +14885,9 @@
+vserver-$(CONFIG_VSERVER_LEGACYNET) += legacynet.o
+vserver-$(CONFIG_VSERVER_HISTORY) += history.o
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/context.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/context.c
---- linux-2.6.18.1/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/context.c 2006-10-20 02:22:01 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/context.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/context.c
+--- linux-2.6.18.2/kernel/vserver/context.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/context.c 2006-11-06 05:31:43 +0100
@@ -0,0 +1,926 @@
+/*
+ * linux/kernel/vserver/context.c
@@ -15802,9 +15815,9 @@
+
+EXPORT_SYMBOL_GPL(free_vx_info);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt.c
---- linux-2.6.18.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt.c
+--- linux-2.6.18.2/kernel/vserver/cvirt.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,260 @@
+/*
+ * linux/kernel/vserver/cvirt.c
@@ -16066,9 +16079,9 @@
+ put_vx_info(vxi);
+ return (name ? 0 : -EFAULT);
+}
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_init.h
---- linux-2.6.18.1/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt_init.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt_init.h
+--- linux-2.6.18.2/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt_init.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,78 @@
+
+
@@ -16148,9 +16161,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/cvirt_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_proc.h
---- linux-2.6.18.1/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/cvirt_proc.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt_proc.h
+--- linux-2.6.18.2/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/cvirt_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,92 @@
+#ifndef _VX_CVIRT_PROC_H
+#define _VX_CVIRT_PROC_H
@@ -16244,9 +16257,9 @@
+}
+
+#endif /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/dlimit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/dlimit.c
---- linux-2.6.18.1/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/dlimit.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/dlimit.c
+--- linux-2.6.18.2/kernel/vserver/dlimit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/dlimit.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,548 @@
+/*
+ * linux/kernel/vserver/dlimit.c
@@ -16796,9 +16809,9 @@
+EXPORT_SYMBOL_GPL(locate_dl_info);
+EXPORT_SYMBOL_GPL(rcu_free_dl_info);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/helper.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/helper.c
---- linux-2.6.18.1/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/helper.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/helper.c
+--- linux-2.6.18.2/kernel/vserver/helper.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/helper.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,210 @@
+/*
+ * linux/kernel/vserver/helper.c
@@ -17010,9 +17023,9 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/history.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/history.c
---- linux-2.6.18.1/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/history.c 2006-10-20 00:40:24 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/history.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/history.c
+--- linux-2.6.18.2/kernel/vserver/history.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/history.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,183 @@
+/*
+ * kernel/vserver/history.c
@@ -17197,9 +17210,9 @@
+
+EXPORT_SYMBOL_GPL(vxh_advance);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/init.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/init.c
---- linux-2.6.18.1/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/init.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/init.c
+--- linux-2.6.18.2/kernel/vserver/init.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/init.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,43 @@
+/*
+ * linux/kernel/init.c
@@ -17244,9 +17257,9 @@
+module_init(init_vserver);
+module_exit(exit_vserver);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/inode.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/inode.c
---- linux-2.6.18.1/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/inode.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/inode.c
+--- linux-2.6.18.2/kernel/vserver/inode.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/inode.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,368 @@
+/*
+ * linux/kernel/vserver/inode.c
@@ -17616,9 +17629,9 @@
+
+EXPORT_SYMBOL_GPL(vx_propagate_xid);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacy.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacy.c
---- linux-2.6.18.1/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacy.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/legacy.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/legacy.c
+--- linux-2.6.18.2/kernel/vserver/legacy.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/legacy.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,113 @@
+/*
+ * linux/kernel/vserver/legacy.c
@@ -17733,9 +17746,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/legacynet.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacynet.c
---- linux-2.6.18.1/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/legacynet.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/legacynet.c
+--- linux-2.6.18.2/kernel/vserver/legacynet.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/legacynet.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,84 @@
+
+/*
@@ -17821,9 +17834,9 @@
+}
+
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit.c
---- linux-2.6.18.1/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit.c
+--- linux-2.6.18.2/kernel/vserver/limit.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,238 @@
+/*
+ * linux/kernel/vserver/limit.c
@@ -18063,9 +18076,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_init.h
---- linux-2.6.18.1/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit_init.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit_init.h
+--- linux-2.6.18.2/kernel/vserver/limit_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit_init.h 2006-10-29 05:06:18 +0100
@@ -0,0 +1,29 @@
+
+
@@ -18096,9 +18109,9 @@
+#endif
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/limit_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_proc.h
---- linux-2.6.18.1/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/limit_proc.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit_proc.h
+--- linux-2.6.18.2/kernel/vserver/limit_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/limit_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,58 @@
+#ifndef _VX_LIMIT_PROC_H
+#define _VX_LIMIT_PROC_H
@@ -18158,9 +18171,9 @@
+#endif /* _VX_LIMIT_PROC_H */
+
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/namespace.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/namespace.c
---- linux-2.6.18.1/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/namespace.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/namespace.c
+--- linux-2.6.18.2/kernel/vserver/namespace.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/namespace.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,113 @@
+/*
+ * linux/kernel/vserver/namespace.c
@@ -18275,9 +18288,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/network.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/network.c
---- linux-2.6.18.1/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/network.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/network.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/network.c
+--- linux-2.6.18.2/kernel/vserver/network.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/network.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,807 @@
+/*
+ * linux/kernel/vserver/network.c
@@ -19086,9 +19099,9 @@
+EXPORT_SYMBOL_GPL(free_nx_info);
+EXPORT_SYMBOL_GPL(unhash_nx_info);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/proc.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/proc.c
---- linux-2.6.18.1/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/proc.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/proc.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/proc.c
+--- linux-2.6.18.2/kernel/vserver/proc.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/proc.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,860 @@
+/*
+ * linux/kernel/vserver/proc.c
@@ -19950,9 +19963,9 @@
+ return buffer - orig;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched.c
---- linux-2.6.18.1/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched.c
+--- linux-2.6.18.2/kernel/vserver/sched.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,217 @@
+/*
+ * linux/kernel/vserver/sched.c
@@ -20171,9 +20184,9 @@
+ return 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_init.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_init.h
---- linux-2.6.18.1/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_init.h 2006-10-29 03:23:05 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched_init.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched_init.h
+--- linux-2.6.18.2/kernel/vserver/sched_init.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched_init.h 2006-11-06 05:08:58 +0100
@@ -0,0 +1,33 @@
+
+static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -20208,9 +20221,9 @@
+ return;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sched_proc.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_proc.h
---- linux-2.6.18.1/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sched_proc.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched_proc.h
+--- linux-2.6.18.2/kernel/vserver/sched_proc.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sched_proc.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,40 @@
+#ifndef _VX_SCHED_PROC_H
+#define _VX_SCHED_PROC_H
@@ -20252,9 +20265,9 @@
+}
+
+#endif /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/signal.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/signal.c
---- linux-2.6.18.1/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/signal.c 2006-10-25 03:42:52 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/signal.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/signal.c
+--- linux-2.6.18.2/kernel/vserver/signal.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/signal.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,139 @@
+/*
+ * linux/kernel/vserver/signal.c
@@ -20395,9 +20408,9 @@
+ return ret;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/switch.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/switch.c
---- linux-2.6.18.1/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/switch.c 2006-10-29 03:23:24 +0100
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/switch.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/switch.c
+--- linux-2.6.18.2/kernel/vserver/switch.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/switch.c 2006-11-06 05:08:58 +0100
@@ -0,0 +1,268 @@
+/*
+ * linux/kernel/vserver/switch.c
@@ -20667,9 +20680,9 @@
+}
+
+#endif /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/sysctl.c linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sysctl.c
---- linux-2.6.18.1/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/sysctl.c linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sysctl.c
+--- linux-2.6.18.2/kernel/vserver/sysctl.c 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/sysctl.c 2006-09-20 17:01:45 +0200
@@ -0,0 +1,227 @@
+/*
+ * kernel/vserver/sysctl.c
@@ -20898,9 +20911,9 @@
+EXPORT_SYMBOL_GPL(vx_debug_cvirt);
+EXPORT_SYMBOL_GPL(vx_debug_misc);
+
-diff -NurpP --minimal linux-2.6.18.1/kernel/vserver/vci_config.h linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/vci_config.h
---- linux-2.6.18.1/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/kernel/vserver/vci_config.h linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/vci_config.h
+--- linux-2.6.18.2/kernel/vserver/vci_config.h 1970-01-01 01:00:00 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/kernel/vserver/vci_config.h 2006-09-20 17:01:45 +0200
@@ -0,0 +1,70 @@
+
+enum {
@@ -20972,9 +20985,9 @@
+ 0;
+}
+
-diff -NurpP --minimal linux-2.6.18.1/mm/filemap_xip.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/filemap_xip.c
---- linux-2.6.18.1/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/filemap_xip.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/filemap_xip.c
+--- linux-2.6.18.2/mm/filemap_xip.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/filemap_xip.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/uio.h>
@@ -20983,9 +20996,9 @@
#include <asm/tlbflush.h>
#include "filemap.h"
-diff -NurpP --minimal linux-2.6.18.1/mm/fremap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/fremap.c
---- linux-2.6.18.1/mm/fremap.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/fremap.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/fremap.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/fremap.c
+--- linux-2.6.18.2/mm/fremap.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/fremap.c 2006-09-20 17:01:45 +0200
@@ -15,6 +15,7 @@
#include <linux/rmap.h>
#include <linux/module.h>
@@ -21003,9 +21016,9 @@
if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
inc_mm_counter(mm, file_rss);
-diff -NurpP --minimal linux-2.6.18.1/mm/hugetlb.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/hugetlb.c
---- linux-2.6.18.1/mm/hugetlb.c 2006-09-20 16:58:44 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/hugetlb.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/hugetlb.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/hugetlb.c
+--- linux-2.6.18.2/mm/hugetlb.c 2006-09-20 16:58:44 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/hugetlb.c 2006-09-20 17:01:45 +0200
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
@@ -21014,10 +21027,10 @@
#include "internal.h"
const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-2.6.18.1/mm/memory.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/memory.c
---- linux-2.6.18.1/mm/memory.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/memory.c 2006-09-20 17:22:18 +0200
-@@ -1958,6 +1958,11 @@ static int do_swap_page(struct mm_struct
+diff -NurpP --minimal linux-2.6.18.2/mm/memory.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/memory.c
+--- linux-2.6.18.2/mm/memory.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/memory.c 2006-11-06 04:47:17 +0100
+@@ -1965,6 +1965,11 @@ static int do_swap_page(struct mm_struct
grab_swap_token();
}
@@ -21029,7 +21042,7 @@
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
mark_page_accessed(page);
lock_page(page);
-@@ -2030,6 +2035,8 @@ static int do_anonymous_page(struct mm_s
+@@ -2037,6 +2042,8 @@ static int do_anonymous_page(struct mm_s
/* Allocate our own private page. */
pte_unmap(page_table);
@@ -21038,7 +21051,7 @@
if (unlikely(anon_vma_prepare(vma)))
goto oom;
page = alloc_zeroed_user_highpage(vma, address);
-@@ -2108,6 +2115,9 @@ static int do_no_page(struct mm_struct *
+@@ -2115,6 +2122,9 @@ static int do_no_page(struct mm_struct *
smp_rmb(); /* serializes i_size against truncate_count */
}
retry:
@@ -21048,9 +21061,9 @@
new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret);
/*
* No smp_rmb is needed here as long as there's a full
-diff -NurpP --minimal linux-2.6.18.1/mm/mlock.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mlock.c
---- linux-2.6.18.1/mm/mlock.c 2006-04-09 13:49:58 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mlock.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/mlock.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/mlock.c
+--- linux-2.6.18.2/mm/mlock.c 2006-04-09 13:49:58 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/mlock.c 2006-09-20 17:01:45 +0200
@@ -10,6 +10,7 @@
#include <linux/mm.h>
#include <linux/mempolicy.h>
@@ -21107,9 +21120,9 @@
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -NurpP --minimal linux-2.6.18.1/mm/mmap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mmap.c
---- linux-2.6.18.1/mm/mmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mmap.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/mmap.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/mmap.c
+--- linux-2.6.18.2/mm/mmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/mmap.c 2006-09-20 17:01:45 +0200
@@ -1137,10 +1137,10 @@ munmap_back:
kmem_cache_free(vm_area_cachep, vma);
}
@@ -21208,9 +21221,9 @@
+ return 0;
return 1;
}
-diff -NurpP --minimal linux-2.6.18.1/mm/mremap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/mremap.c
---- linux-2.6.18.1/mm/mremap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/mremap.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/mremap.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/mremap.c
+--- linux-2.6.18.2/mm/mremap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/mremap.c 2006-09-20 17:01:45 +0200
@@ -18,6 +18,7 @@
#include <linux/highmem.h>
#include <linux/security.h>
@@ -21260,9 +21273,9 @@
make_pages_present(addr + old_len,
addr + new_len);
}
-diff -NurpP --minimal linux-2.6.18.1/mm/nommu.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/nommu.c
---- linux-2.6.18.1/mm/nommu.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/nommu.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/nommu.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/nommu.c
+--- linux-2.6.18.2/mm/nommu.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/nommu.c 2006-09-20 17:01:45 +0200
@@ -820,7 +820,7 @@ unsigned long do_mmap_pgoff(struct file
realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);
@@ -21290,9 +21303,9 @@
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
-diff -NurpP --minimal linux-2.6.18.1/mm/oom_kill.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/oom_kill.c
---- linux-2.6.18.1/mm/oom_kill.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/oom_kill.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/oom_kill.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/oom_kill.c
+--- linux-2.6.18.2/mm/oom_kill.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/oom_kill.c 2006-09-20 17:01:45 +0200
@@ -67,6 +67,8 @@ unsigned long badness(struct task_struct
*/
task_unlock(p);
@@ -21302,9 +21315,9 @@
/*
* Processes which fork a lot of child processes are likely
* a good choice. We add half the vmsize of the children if they
-diff -NurpP --minimal linux-2.6.18.1/mm/page_alloc.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/page_alloc.c
---- linux-2.6.18.1/mm/page_alloc.c 2006-10-17 03:21:24 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/page_alloc.c 2006-10-16 18:56:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/page_alloc.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/page_alloc.c
+--- linux-2.6.18.2/mm/page_alloc.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/page_alloc.c 2006-11-06 04:47:17 +0100
@@ -37,6 +37,7 @@
#include <linux/vmalloc.h>
#include <linux/mempolicy.h>
@@ -21331,9 +21344,9 @@
}
#endif
-diff -NurpP --minimal linux-2.6.18.1/mm/rmap.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/rmap.c
---- linux-2.6.18.1/mm/rmap.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/rmap.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/rmap.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/rmap.c
+--- linux-2.6.18.2/mm/rmap.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/rmap.c 2006-09-20 17:01:45 +0200
@@ -53,6 +53,7 @@
#include <linux/rmap.h>
#include <linux/rcupdate.h>
@@ -21342,9 +21355,9 @@
#include <asm/tlbflush.h>
-diff -NurpP --minimal linux-2.6.18.1/mm/shmem.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/shmem.c
---- linux-2.6.18.1/mm/shmem.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/shmem.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/shmem.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/shmem.c
+--- linux-2.6.18.2/mm/shmem.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/shmem.c 2006-09-20 17:01:45 +0200
@@ -51,7 +51,6 @@
#include <asm/pgtable.h>
@@ -21371,9 +21384,9 @@
sb->s_op = &shmem_ops;
sb->s_time_gran = 1;
-diff -NurpP --minimal linux-2.6.18.1/mm/swapfile.c linux-2.6.18.1-vs2.0.2.2-rc4/mm/swapfile.c
---- linux-2.6.18.1/mm/swapfile.c 2006-09-20 16:58:45 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/mm/swapfile.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/mm/swapfile.c linux-2.6.18.2-vs2.0.2.2-rc5/mm/swapfile.c
+--- linux-2.6.18.2/mm/swapfile.c 2006-09-20 16:58:45 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/mm/swapfile.c 2006-09-20 17:01:45 +0200
@@ -31,6 +31,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
@@ -21391,9 +21404,9 @@
}
/*
-diff -NurpP --minimal linux-2.6.18.1/net/core/dev.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/dev.c
---- linux-2.6.18.1/net/core/dev.c 2006-10-17 03:21:24 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/dev.c 2006-10-16 18:56:11 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/core/dev.c linux-2.6.18.2-vs2.0.2.2-rc5/net/core/dev.c
+--- linux-2.6.18.2/net/core/dev.c 2006-11-04 19:43:24 +0100
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/core/dev.c 2006-10-16 18:56:11 +0200
@@ -117,6 +117,7 @@
#include <linux/dmaengine.h>
#include <linux/err.h>
@@ -21423,9 +21436,9 @@
if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
-diff -NurpP --minimal linux-2.6.18.1/net/core/rtnetlink.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/rtnetlink.c
---- linux-2.6.18.1/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/core/rtnetlink.c linux-2.6.18.2-vs2.0.2.2-rc5/net/core/rtnetlink.c
+--- linux-2.6.18.2/net/core/rtnetlink.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/core/rtnetlink.c 2006-09-20 17:01:45 +0200
@@ -322,6 +322,9 @@ static int rtnetlink_dump_ifinfo(struct
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
@@ -21446,9 +21459,9 @@
skb = alloc_skb(size, GFP_KERNEL);
if (!skb)
return;
-diff -NurpP --minimal linux-2.6.18.1/net/core/sock.c linux-2.6.18.1-vs2.0.2.2-rc4/net/core/sock.c
---- linux-2.6.18.1/net/core/sock.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/core/sock.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/core/sock.c linux-2.6.18.2-vs2.0.2.2-rc5/net/core/sock.c
+--- linux-2.6.18.2/net/core/sock.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/core/sock.c 2006-09-20 17:01:45 +0200
@@ -124,6 +124,9 @@
#include <linux/ipsec.h>
@@ -21514,9 +21527,9 @@
atomic_set(&sk->sk_refcnt, 1);
}
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/af_inet.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/af_inet.c
---- linux-2.6.18.1/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/af_inet.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/af_inet.c
+--- linux-2.6.18.2/net/ipv4/af_inet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/af_inet.c 2006-09-20 17:01:45 +0200
@@ -115,6 +115,7 @@
#ifdef CONFIG_IP_MROUTE
#include <linux/mroute.h>
@@ -21610,9 +21623,9 @@
if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST)
inet->saddr = 0; /* Use device */
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/devinet.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/devinet.c
---- linux-2.6.18.1/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/devinet.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/devinet.c
+--- linux-2.6.18.2/net/ipv4/devinet.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/devinet.c 2006-09-20 17:01:45 +0200
@@ -606,6 +606,9 @@ int devinet_ioctl(unsigned int cmd, void
*colon = ':';
@@ -21674,9 +21687,9 @@
if (ip_idx < s_ip_idx)
continue;
if (inet_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).pid,
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/fib_hash.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/fib_hash.c
---- linux-2.6.18.1/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/fib_hash.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/fib_hash.c
+--- linux-2.6.18.2/net/ipv4/fib_hash.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/fib_hash.c 2006-09-20 17:01:45 +0200
@@ -987,6 +987,8 @@ static unsigned fib_flag_trans(int type,
return flags;
}
@@ -21696,9 +21709,9 @@
snprintf(bf, sizeof(bf),
"%s\t%08X\t%08X\t%04X\t%d\t%u\t%d\t%08X\t%d\t%u\t%u",
fi->fib_dev ? fi->fib_dev->name : "*", prefix,
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_connection_sock.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_connection_sock.c
---- linux-2.6.18.1/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/inet_connection_sock.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_connection_sock.c
+--- linux-2.6.18.2/net/ipv4/inet_connection_sock.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_connection_sock.c 2006-09-20 17:01:45 +0200
@@ -39,7 +39,6 @@ int sysctl_local_port_range[2] = { 1024,
int inet_csk_bind_conflict(const struct sock *sk,
const struct inet_bind_bucket *tb)
@@ -21719,9 +21732,9 @@
break;
}
}
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_diag.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_diag.c
---- linux-2.6.18.1/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/inet_diag.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_diag.c
+--- linux-2.6.18.2/net/ipv4/inet_diag.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_diag.c 2006-09-20 17:01:45 +0200
@@ -693,6 +693,8 @@ static int inet_diag_dump(struct sk_buff
sk_for_each(sk, node, &hashinfo->listening_hash[i]) {
struct inet_sock *inet = inet_sk(sk);
@@ -21749,9 +21762,9 @@
if (num < s_num)
goto next_dying;
if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/inet_hashtables.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_hashtables.c
---- linux-2.6.18.1/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/inet_hashtables.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_hashtables.c
+--- linux-2.6.18.2/net/ipv4/inet_hashtables.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/inet_hashtables.c 2006-09-20 17:01:45 +0200
@@ -138,11 +138,10 @@ struct sock *__inet_lookup_listener(cons
const __u32 rcv_saddr = inet->rcv_saddr;
int score = sk->sk_family == PF_INET ? 1 : 0;
@@ -21767,9 +21780,9 @@
if (sk->sk_bound_dev_if) {
if (sk->sk_bound_dev_if != dif)
continue;
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/raw.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/raw.c
---- linux-2.6.18.1/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/raw.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/raw.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/raw.c
+--- linux-2.6.18.2/net/ipv4/raw.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/raw.c 2006-09-20 17:01:45 +0200
@@ -102,6 +102,27 @@ static void raw_v4_unhash(struct sock *s
write_unlock_bh(&raw_v4_lock);
}
@@ -21861,9 +21874,9 @@
if (!sk && ++state->bucket < RAWV4_HTABLE_SIZE) {
sk = sk_head(&raw_v4_htable[state->bucket]);
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp.c
---- linux-2.6.18.1/net/ipv4/tcp.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp.c
+--- linux-2.6.18.2/net/ipv4/tcp.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp.c 2006-09-20 17:02:28 +0200
@@ -258,6 +258,7 @@
#include <linux/bootmem.h>
#include <linux/cache.h>
@@ -21872,9 +21885,9 @@
#include <net/icmp.h>
#include <net/tcp.h>
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_ipv4.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_ipv4.c
---- linux-2.6.18.1/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp_ipv4.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp_ipv4.c
+--- linux-2.6.18.2/net/ipv4/tcp_ipv4.c 2006-09-20 16:58:50 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp_ipv4.c 2006-09-20 17:01:45 +0200
@@ -77,6 +77,7 @@
#include <linux/stddef.h>
#include <linux/proc_fs.h>
@@ -21960,9 +21973,9 @@
if (sk->sk_family == st->family)
goto found;
}
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/tcp_minisocks.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_minisocks.c
---- linux-2.6.18.1/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/tcp_minisocks.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp_minisocks.c
+--- linux-2.6.18.2/net/ipv4/tcp_minisocks.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/tcp_minisocks.c 2006-09-20 17:01:45 +0200
@@ -28,6 +28,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -21986,9 +21999,9 @@
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
if (tw->tw_family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-2.6.18.1/net/ipv4/udp.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/udp.c
---- linux-2.6.18.1/net/ipv4/udp.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv4/udp.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv4/udp.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/udp.c
+--- linux-2.6.18.2/net/ipv4/udp.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv4/udp.c 2006-09-20 17:01:45 +0200
@@ -175,14 +175,12 @@ gotit:
struct inet_sock *inet2 = inet_sk(sk2);
@@ -22071,9 +22084,9 @@
if (!sk && ++state->bucket < UDP_HTABLE_SIZE) {
sk = sk_head(&udp_hash[state->bucket]);
-diff -NurpP --minimal linux-2.6.18.1/net/ipv6/addrconf.c linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv6/addrconf.c
---- linux-2.6.18.1/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/ipv6/addrconf.c linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv6/addrconf.c
+--- linux-2.6.18.2/net/ipv6/addrconf.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/ipv6/addrconf.c 2006-09-20 17:01:45 +0200
@@ -2698,7 +2698,10 @@ static void if6_seq_stop(struct seq_file
static int if6_seq_show(struct seq_file *seq, void *v)
{
@@ -22108,9 +22121,9 @@
read_lock(&dev_base_lock);
for (dev=dev_base, idx=0; dev; dev = dev->next, idx++) {
if (idx < s_idx)
-diff -NurpP --minimal linux-2.6.18.1/net/netlink/af_netlink.c linux-2.6.18.1-vs2.0.2.2-rc4/net/netlink/af_netlink.c
---- linux-2.6.18.1/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/netlink/af_netlink.c linux-2.6.18.2-vs2.0.2.2-rc5/net/netlink/af_netlink.c
+--- linux-2.6.18.2/net/netlink/af_netlink.c 2006-09-20 16:58:51 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/netlink/af_netlink.c 2006-09-20 17:01:45 +0200
@@ -56,6 +56,9 @@
#include <linux/types.h>
#include <linux/audit.h>
@@ -22121,9 +22134,9 @@
#include <net/sock.h>
#include <net/scm.h>
-diff -NurpP --minimal linux-2.6.18.1/net/socket.c linux-2.6.18.1-vs2.0.2.2-rc4/net/socket.c
---- linux-2.6.18.1/net/socket.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/socket.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/socket.c linux-2.6.18.2-vs2.0.2.2-rc5/net/socket.c
+--- linux-2.6.18.2/net/socket.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/socket.c 2006-09-20 17:01:45 +0200
@@ -93,6 +93,7 @@
#include <net/sock.h>
@@ -22224,9 +22237,9 @@
err = sock1->ops->socketpair(sock1, sock2);
if (err < 0)
-diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth.c linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth.c
---- linux-2.6.18.1/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/sunrpc/auth.c linux-2.6.18.2-vs2.0.2.2-rc5/net/sunrpc/auth.c
+--- linux-2.6.18.2/net/sunrpc/auth.c 2006-06-18 04:55:52 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/sunrpc/auth.c 2006-09-20 17:01:45 +0200
@@ -13,6 +13,7 @@
#include <linux/errno.h>
#include <linux/sunrpc/clnt.h>
@@ -22251,9 +22264,9 @@
.group_info = current->group_info,
};
struct rpc_cred *ret;
-diff -NurpP --minimal linux-2.6.18.1/net/sunrpc/auth_unix.c linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth_unix.c
---- linux-2.6.18.1/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/sunrpc/auth_unix.c linux-2.6.18.2-vs2.0.2.2-rc5/net/sunrpc/auth_unix.c
+--- linux-2.6.18.2/net/sunrpc/auth_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/sunrpc/auth_unix.c 2006-09-20 17:01:45 +0200
@@ -11,12 +11,14 @@
#include <linux/module.h>
#include <linux/sunrpc/clnt.h>
@@ -22319,9 +22332,9 @@
hold = p++;
for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
*p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-2.6.18.1/net/unix/af_unix.c linux-2.6.18.1-vs2.0.2.2-rc4/net/unix/af_unix.c
---- linux-2.6.18.1/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/unix/af_unix.c linux-2.6.18.2-vs2.0.2.2-rc5/net/unix/af_unix.c
+--- linux-2.6.18.2/net/unix/af_unix.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/unix/af_unix.c 2006-09-20 17:01:45 +0200
@@ -116,6 +116,9 @@
#include <linux/mount.h>
#include <net/checksum.h>
@@ -22350,9 +22363,9 @@
if (err)
goto out_mknod_dput;
mutex_unlock(&nd.dentry->d_inode->i_mutex);
-diff -NurpP --minimal linux-2.6.18.1/net/x25/af_x25.c linux-2.6.18.1-vs2.0.2.2-rc4/net/x25/af_x25.c
---- linux-2.6.18.1/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/net/x25/af_x25.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/net/x25/af_x25.c linux-2.6.18.2-vs2.0.2.2-rc5/net/x25/af_x25.c
+--- linux-2.6.18.2/net/x25/af_x25.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/net/x25/af_x25.c 2006-09-20 17:01:45 +0200
@@ -501,7 +501,10 @@ static int x25_create(struct socket *soc
x25 = x25_sk(sk);
@@ -22365,9 +22378,9 @@
x25_init_timers(sk);
-diff -NurpP --minimal linux-2.6.18.1/security/commoncap.c linux-2.6.18.1-vs2.0.2.2-rc4/security/commoncap.c
---- linux-2.6.18.1/security/commoncap.c 2006-09-20 16:58:54 +0200
-+++ linux-2.6.18.1-vs2.0.2.2-rc4/security/commoncap.c 2006-09-20 17:01:45 +0200
+diff -NurpP --minimal linux-2.6.18.2/security/commoncap.c linux-2.6.18.2-vs2.0.2.2-rc5/security/commoncap.c
+--- linux-2.6.18.2/security/commoncap.c 2006-09-20 16:58:54 +0200
++++ linux-2.6.18.2-vs2.0.2.2-rc5/security/commoncap.c 2006-09-20 17:01:45 +0200
@@ -142,7 +142,7 @@ void cap_bprm_apply_creds (struct linux_
/* Derived from fs/exec.c:compute_creds. */
kernel_cap_t new_permitted, working;
Modified: dists/trunk/linux-2.6/debian/patches/series/4-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/4-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/4-extra Mon Nov 6 13:17:42 2006
@@ -1,7 +1,3 @@
-+ features/all/vserver/vs2.0.2.2-rc4.patch *_vserver *_xen-vserver
-+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
-+ features/all/xen/vserver-clash.patch *_xen-vserver
-+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
- mips-dec-scsi.patch mipsel
- mips-dec-serial.patch mipsel
+ bugfix/mips/dec-scsi.patch mipsel
Added: dists/trunk/linux-2.6/debian/patches/series/5-extra
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/series/5-extra Mon Nov 6 13:17:42 2006
@@ -0,0 +1,4 @@
++ features/all/vserver/vs2.0.2.2-rc5.patch *_vserver *_xen-vserver
++ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
++ features/all/xen/vserver-clash.patch *_xen-vserver
++ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
More information about the Kernel-svn-changes
mailing list