SOURCES: linux-2.6-vs2.3.patch - resolved conflicts with suspend2

[baggins]

Author: baggins                      Date: Tue Jan  2 14:16:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- resolved conflicts with suspend2

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1 SOURCES/linux-2.6-vs2.3.patch:1.2
--- SOURCES/linux-2.6-vs2.3.patch:1.1	Tue Jan  2 15:13:37 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Jan  2 15:16:12 2007
@@ -20994,13 +20994,13 @@
 --- 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 @@
 --- 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.1&r2=1.2&f=u