packages: kernel/kernel-vserver-2.3.patch, kernel/kernel-aufs2.patch - reso...

[baggins]

Author: baggins                      Date: Tue Jul 12 12:49:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolve conflict between aufs2 and vserver

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.70 -> 1.71) , kernel-aufs2.patch (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.70 packages/kernel/kernel-vserver-2.3.patch:1.71
--- packages/kernel/kernel-vserver-2.3.patch:1.70	Tue Jul 12 12:27:51 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Tue Jul 12 14:49:24 2011
@@ -26377,11 +26377,6 @@
  		return -EPERM;
  	return 0;
  }
-@@ -971,3 +978,4 @@ int cap_file_mmap(struct file *file, uns
- 	}
- 	return ret;
- }
-+
 diff -NurpP --minimal linux-3.0-rc5/security/selinux/hooks.c linux-3.0-rc5-vs2.3.1-pre3/security/selinux/hooks.c
 --- linux-3.0-rc5/security/selinux/hooks.c	2011-07-01 11:14:28.000000000 +0200
 +++ linux-3.0-rc5-vs2.3.1-pre3/security/selinux/hooks.c	2011-06-15 02:40:14.000000000 +0200

================================================================
Index: packages/kernel/kernel-aufs2.patch
diff -u packages/kernel/kernel-aufs2.patch:1.21 packages/kernel/kernel-aufs2.patch:1.22
--- packages/kernel/kernel-aufs2.patch:1.21	Mon Jul 11 11:46:53 2011
+++ packages/kernel/kernel-aufs2.patch	Tue Jul 12 14:49:24 2011
@@ -260,9 +260,9 @@
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ 	}
  	return ret;
  }
- 
 +EXPORT_SYMBOL(cap_file_mmap);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
 index 1be6826..215278c 100644
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.70&r2=1.71&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2.patch?r1=1.21&r2=1.22&f=u