- resolved conflicts with suspend2

Changed files:
    kernel-vserver-2.3.patch -> 1.2
    linux-2.6-vs2.3.patch -> 1.2

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 7496f3f5b023cb5a75907528c8c2a58282198872..70ca542e132c6313a4d4f276703317fb245c417f 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -20994,13 +20994,13 @@ diff -NurpP --minimal linux-2.6.19.1/kernel/signal.c linux-2.6.19.1-vs2.3.0.6/ke
 --- linux-2.6.19.1/kernel/signal.c     2006-11-30 21:19:44 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/kernel/signal.c   2006-11-30 19:43:08 +0100
 @@ -23,6 +23,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_context.h>
  #include <linux/ptrace.h>
  #include <linux/signal.h>
  #include <linux/capability.h>
-+#include <linux/vs_context.h>
- #include <asm/param.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
 @@ -577,17 +578,30 @@ static int check_kill_permission(int sig
                                 struct task_struct *t)
  {
@@ -21329,16 +21329,16 @@ diff -NurpP --minimal linux-2.6.19.1/kernel/timer.c linux-2.6.19.1-vs2.3.0.6/ker
 --- linux-2.6.19.1/kernel/timer.c      2006-11-30 21:19:44 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/kernel/timer.c    2006-11-08 06:18:54 +0100
 @@ -34,6 +34,10 @@
- #include <linux/cpu.h>
- #include <linux/syscalls.h>
- #include <linux/delay.h>
+ #include <linux/time.h>
+ #include <linux/jiffies.h>
+ #include <linux/posix-timers.h>
 +#include <linux/vs_base.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
 +#include <linux/vserver/sched.h>
- 
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
+ #include <linux/delay.h>
 @@ -1082,12 +1086,6 @@ asmlinkage unsigned long sys_alarm(unsig
  
  #endif

diff --git a/linux-2.6-vs2.3.patch b/linux-2.6-vs2.3.patch
index 7496f3f5b023cb5a75907528c8c2a58282198872..70ca542e132c6313a4d4f276703317fb245c417f 100644 (file)
--- a/linux-2.6-vs2.3.patch
+++ b/linux-2.6-vs2.3.patch
@@ -20994,13 +20994,13 @@ diff -NurpP --minimal linux-2.6.19.1/kernel/signal.c linux-2.6.19.1-vs2.3.0.6/ke
 --- linux-2.6.19.1/kernel/signal.c     2006-11-30 21:19:44 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/kernel/signal.c   2006-11-30 19:43:08 +0100
 @@ -23,6 +23,7 @@
+ #include <linux/binfmts.h>
+ #include <linux/security.h>
+ #include <linux/syscalls.h>
++#include <linux/vs_context.h>
  #include <linux/ptrace.h>
  #include <linux/signal.h>
  #include <linux/capability.h>
-+#include <linux/vs_context.h>
- #include <asm/param.h>
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
 @@ -577,17 +578,30 @@ static int check_kill_permission(int sig
                                 struct task_struct *t)
  {
@@ -21329,16 +21329,16 @@ diff -NurpP --minimal linux-2.6.19.1/kernel/timer.c linux-2.6.19.1-vs2.3.0.6/ker
 --- linux-2.6.19.1/kernel/timer.c      2006-11-30 21:19:44 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/kernel/timer.c    2006-11-08 06:18:54 +0100
 @@ -34,6 +34,10 @@
- #include <linux/cpu.h>
- #include <linux/syscalls.h>
- #include <linux/delay.h>
+ #include <linux/time.h>
+ #include <linux/jiffies.h>
+ #include <linux/posix-timers.h>
 +#include <linux/vs_base.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
 +#include <linux/vserver/sched.h>
- 
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
+ #include <linux/delay.h>
 @@ -1082,12 +1086,6 @@ asmlinkage unsigned long sys_alarm(unsig
  
  #endif