projects / linux-flexiantxendom0.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bbcbc51)
UBUNTU: [Config] updateconfigs after apparmor patches
authorTim Gardner <tim.gardner@canonical.com>
Mon, 27 Feb 2012 15:05:51 +0000 (08:05 -0700)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:21:54 +0000 (13:21 -0700)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

debian.master/config/config.common.ubuntu patch | blob | history

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 40c1f18..8d748eb 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4581,7 +4581,6 @@ CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
-CONFIG_SECURITY_APPARMOR_COMPAT_24=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
Port of xen3.3 xenlinux code to Ubuntu Precise kernel (3.2)