SOURCES (LINUX_2_6): kernel-suspend2-headers.patch, linux-2.6-vs2....

[arekm]

Author: arekm                        Date: Sun Jan 20 11:15:46 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated to not conflict

---- Files affected:
SOURCES:
   kernel-suspend2-headers.patch (1.1.2.3 -> 1.1.2.4) , linux-2.6-vs2.3.patch (1.2.4.11.2.14 -> 1.2.4.11.2.15) 

---- Diffs:

================================================================
Index: SOURCES/kernel-suspend2-headers.patch
diff -u SOURCES/kernel-suspend2-headers.patch:1.1.2.3 SOURCES/kernel-suspend2-headers.patch:1.1.2.4
--- SOURCES/kernel-suspend2-headers.patch:1.1.2.3	Sun Jan 20 11:44:50 2008
+++ SOURCES/kernel-suspend2-headers.patch	Sun Jan 20 12:15:39 2008
@@ -28,3 +28,42 @@
  
  #include <asm/uaccess.h>
  
+--- a/kernel/timer.c.org	2008-01-20 11:46:53.931178999 +0100
++++ b/kernel/timer.c	2008-01-20 11:47:09.758637482 +0100
+@@ -32,13 +32,13 @@
+ #include <linux/time.h>
+ #include <linux/jiffies.h>
+ #include <linux/posix-timers.h>
++#include <linux/notifier.h>
++#include <linux/suspend.h>
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
+ #include <linux/delay.h>
+ #include <linux/tick.h>
+ #include <linux/kallsyms.h>
+-#include <linux/notifier.h>
+-#include <linux/suspend.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/unistd.h>
+
+--- a/include/linux/fs.h.org	2008-01-20 11:56:05.845456959 +0100
++++ b/include/linux/fs.h	2008-01-20 11:56:23.109653995 +0100
+@@ -119,6 +119,9 @@
+ #define MS_VERBOSE	32768	/* War is peace. Verbosity is silence.
+ 				   MS_VERBOSE is deprecated. */
+ #define MS_SILENT	32768
++
++#define MS_FROZEN	(1<<23)	/* Frozen by freeze_filesystems() */
++
+ #define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
+ #define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
+ #define MS_PRIVATE	(1<<18)	/* change to private */
+@@ -126,7 +129,6 @@
+ #define MS_SHARED	(1<<20)	/* change to shared */
+ #define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */
+ #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
+-#define MS_FROZEN	(1<<23)	/* Frozen by freeze_filesystems() */
+ #define MS_ACTIVE	(1<<30)
+ #define MS_NOUSER	(1<<31)
+ 

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.14 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.15
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.14	Fri Jan 18 21:51:38 2008
+++ SOURCES/linux-2.6-vs2.3.patch	Sun Jan 20 12:15:40 2008
@@ -9970,7 +9970,7 @@
 --- linux-2.6.24-rc7/include/linux/fs.h	2007-11-29 01:12:23 +0100
 +++ linux-2.6.24-rc7-vs2.2.0.5.0.7/include/linux/fs.h	2007-12-13 13:25:51 +0100
 @@ -124,6 +124,8 @@ extern int dir_notify_enable;
- #define MS_SHARED	(1<<20)	/* change to shared */
+ #define MS_SHARED	(1<<20) /* change to shared */
  #define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */
  #define MS_KERNMOUNT	(1<<22) /* this is a kern_mount call */
 +#define MS_TAGGED	(1<<24) /* use generic inode tagging */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-suspend2-headers.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.14&r2=1.2.4.11.2.15&f=u