SOURCES: kernel-vserver-2.3.patch - resolved conflict with tuxonice

[baggins]

Author: baggins                      Date: Thu Apr 16 09:17:33 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- resolved conflict with tuxonice

---- Files affected:
SOURCES:
   kernel-vserver-2.3.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vserver-2.3.patch
diff -u SOURCES/kernel-vserver-2.3.patch:1.6 SOURCES/kernel-vserver-2.3.patch:1.7
--- SOURCES/kernel-vserver-2.3.patch:1.6	Thu Apr 16 11:02:37 2009
+++ SOURCES/kernel-vserver-2.3.patch	Thu Apr 16 11:17:26 2009
@@ -8749,10 +8749,10 @@
  #define MS_NOUSER	(1<<31)
  
 @@ -167,6 +170,14 @@ struct inodes_stat_t {
- #define S_NOCMTIME	128	/* Do not update file c/mtime */
- #define S_SWAPFILE	256	/* Do not truncate: swapon got its bmaps */
  #define S_PRIVATE	512	/* Inode is fs-internal */
-+#define S_IXUNLINK	1024	/* Immutable Invert on unlink */
+ #define S_ATOMIC_COPY	1024	/* Pages mapped with this inode need to be
+ 				   atomically copied (gem) */
++#define S_IXUNLINK	2048	/* Immutable Invert on unlink */
 +
 +/* Linux-VServer related Inode flags */
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vserver-2.3.patch?r1=1.6&r2=1.7&f=u