packages: kernel/kernel-vserver-2.3.patch - resolve conflict with tuxonice

[baggins]

Author: baggins                      Date: Sun May 31 21:25:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve conflict with tuxonice

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.10 packages/kernel/kernel-vserver-2.3.patch:1.11
--- packages/kernel/kernel-vserver-2.3.patch:1.10	Sun May 31 23:13:15 2009
+++ packages/kernel/kernel-vserver-2.3.patch	Sun May 31 23:25:28 2009
@@ -8821,10 +8821,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/packages/kernel/kernel-vserver-2.3.patch?r1=1.10&r2=1.11&f=u