diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/Makefile DEVEL/linux-2.4.22-vs1.1.2/Makefile
--- DEVEL/linux-2.4.22-vs1.1.1/Makefile	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/Makefile	Mon Dec  1 16:29:11 2003
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -vs1.1.1
+EXTRAVERSION = -vs1.1.2
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/fs/quota.c DEVEL/linux-2.4.22-vs1.1.2/fs/quota.c
--- DEVEL/linux-2.4.22-vs1.1.1/fs/quota.c	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/fs/quota.c	Mon Dec  1 16:29:11 2003
@@ -308,11 +308,11 @@ static int check_compat_quotactl_valid(s
 	if (cmd == Q_V1_GETQUOTA || cmd == Q_V2_GETQUOTA) {
 		if (((type == USRQUOTA && current->euid != id) ||
 		     (type == GRPQUOTA && !in_egroup_p(id))) &&
-		    !capable(CAP_SYS_ADMIN))
+		    !capable(CAP_SYS_ADMIN) && !capable(CAP_QUOTACTL))
 			return -EPERM;
 	}
 	else if (cmd != Q_V1_GETSTATS && cmd != Q_V2_GETSTATS && cmd != Q_V2_GETINFO && cmd != Q_COMP_SYNC)
-		if (!capable(CAP_SYS_ADMIN))
+		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_QUOTACTL))
 			return -EPERM;
 	return 0;
 }
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-alpha/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-alpha/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-alpha/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-alpha/unistd.h	Mon Dec  1 16:29:11 2003
@@ -233,7 +233,7 @@
 #define __NR_osf_memcntl	260	/* not implemented */
 #define __NR_osf_fdatasync	261	/* not implemented */
 
-#define __NR_virtual_context	273
+#define __NR_vserver	273
 
 /*
  * Linux-specific system calls begin at 300
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-i386/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-i386/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-i386/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-i386/unistd.h	Mon Dec  1 16:29:11 2003
@@ -258,7 +258,7 @@
 #define __NR_free_hugepages	251
 #define __NR_exit_group		252
 
-#define __NR_virtual_context	273
+#define __NR_vserver	273
 
 /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
 
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-ppc/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-ppc/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-ppc/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-ppc/unistd.h	Mon Dec  1 16:29:11 2003
@@ -239,7 +239,7 @@
 #define __NR_io_cancel		231
 #endif
 
-#define __NR_virtual_context	273
+#define __NR_vserver	273
 
 #define __NR(n)	#n
 
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-sparc/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-sparc/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-sparc/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-sparc/unistd.h	Mon Dec  1 16:29:11 2003
@@ -272,7 +272,7 @@
 #define __NR_nfsservctl         254
 #define __NR_aplib              255
 
-#define __NR_virtual_context	273
+#define __NR_vserver	273
 
 #define _syscall0(type,name) \
 type name(void) \
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-sparc64/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-sparc64/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-sparc64/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-sparc64/unistd.h	Mon Dec  1 16:29:11 2003
@@ -274,7 +274,7 @@
 #define __NR_nfsservctl         254
 #define __NR_aplib              255
 
-#define __NR_virtual_context	273
+#define __NR_vserver	273
 
 #define _syscall0(type,name) \
 type name(void) \
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-x86_64/ia32_unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-x86_64/ia32_unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-x86_64/ia32_unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-x86_64/ia32_unistd.h	Mon Dec  1 16:29:11 2003
@@ -250,7 +250,7 @@
 #define __NR_ia32_sched_setaffinity	241
 #define __NR_ia32_sched_getaffinity	242
 
-#define __NR_ia32_virtual_context	273
+#define __NR_ia32_vserver	273
 
 #define IA32_NR_syscalls 274
 
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/asm-x86_64/unistd.h DEVEL/linux-2.4.22-vs1.1.2/include/asm-x86_64/unistd.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/asm-x86_64/unistd.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/asm-x86_64/unistd.h	Mon Dec  1 16:29:11 2003
@@ -496,10 +496,10 @@ __SYSCALL(__NR_remap_file_pages, sys_ni_
 #define __NR_getdents64 217
 __SYSCALL(__NR_getdents64, sys_getdents64)
 
-#define __NR_virtual_context	273
-__SYSCALL(__NR_virtual_context, sys_vserver)
+#define __NR_vserver	273
+__SYSCALL(__NR_vserver, sys_vserver)
 
-#define __NR_syscall_max __NR_virtual_context
+#define __NR_syscall_max __NR_vserver
 
 #ifndef __NO_STUBS
 
diff -NurpP --minimal DEVEL/linux-2.4.22-vs1.1.1/include/net/route.h DEVEL/linux-2.4.22-vs1.1.2/include/net/route.h
--- DEVEL/linux-2.4.22-vs1.1.1/include/net/route.h	Mon Dec  1 16:28:51 2003
+++ DEVEL/linux-2.4.22-vs1.1.2/include/net/route.h	Mon Dec  1 16:29:11 2003
@@ -32,6 +32,7 @@
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
+#include <linux/vcontext.h>
 
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.