summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-10-28 17:00:45 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-10-28 17:00:45 +0100
commitb899d4ec2d51dcc10252c2e8240dd5a89251c05c (patch)
treebbd3bda1e4eb671fe8a555194a63d2bd3d0f64c6 /kernel-s390x-debug-rhel.config
parentd9f04076fb95d311ddb61a62d452cd25468b0d64 (diff)
parenta616131ac22d45b75445824b5de79959ceefe320 (diff)
downloadkernel-b899d4ec2d51dcc10252c2e8240dd5a89251c05c.tar.gz
kernel-b899d4ec2d51dcc10252c2e8240dd5a89251c05c.tar.xz
kernel-b899d4ec2d51dcc10252c2e8240dd5a89251c05c.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc1.20201028gited8780e3f2ec.57.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-debug-rhel.config')
-rw-r--r--kernel-s390x-debug-rhel.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index c24ce3304..7cf76e984 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4463,7 +4463,7 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_DISABLE=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256
CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9
CONFIG_SECURITY_SELINUX=y