From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 12 Jul 2011 12:49:24 +0000 (+0000)
Subject: - resolve conflict between aufs2 and vserver
X-Git-Tag: auto/th/kernel-3_0_3-0_3~42
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=94337f0da6ed56bff37f19352e06dea87ff2b224;p=packages%2Fkernel.git

- 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 e62377b5..6d22ee11 100644
--- 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 81eead05..f357d3e1 100644
--- 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