- resolve conflict between aufs2 and vserver

Changed files:
    kernel-aufs2.patch -> 1.22
    kernel-vserver-2.3.patch -> 1.71

diff --git a/kernel-aufs2.patch b/kernel-aufs2.patch
index e62377b5d91b1a045add3ce1db8cab5d3ac35973..6d22ee11c5f368a7daf5240b1909daceccae2e5a 100644 (file)
--- a/kernel-aufs2.patch
+++ b/kernel-aufs2.patch
@@ -260,9 +260,9 @@ index a93b3b7..024282c 100644
 --- 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

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 81eead05ff1e99be848b8dfab3ef60272c7caba3..f357d3e1f2f762a2cf2ed9b01fbb033878372b92 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -26377,11 +26377,6 @@ diff -NurpP --minimal linux-3.0-rc5/security/commoncap.c linux-3.0-rc5-vs2.3.1-p
                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