summaryrefslogtreecommitdiffstats
path: root/config-s390x
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-05-17 09:03:07 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-05-17 11:14:02 -0400
commit6116861edf2be2615467c0f189153f95badf7e58 (patch)
tree4cde55ba426e107151683f8b4356c2a1d9d97b84 /config-s390x
parent59915d41e79894c3ddd27a6a83e74b3991b23451 (diff)
downloadkernel-6116861edf2be2615467c0f189153f95badf7e58.tar.gz
kernel-6116861edf2be2615467c0f189153f95badf7e58.tar.xz
kernel-6116861edf2be2615467c0f189153f95badf7e58.zip
Linux v4.6
- Disable CONFIG_DEBUG_VM_PGFLAGS on non debug kernels (rhbz 1335173) - CVE-2016-3713 kvm: out-of-bounds access in set_var_mtrr_msr (rhbz 1332139 1336410)
Diffstat (limited to 'config-s390x')
-rw-r--r--config-s390x2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-s390x b/config-s390x
index a41d95ac4..d1ed636d9 100644
--- a/config-s390x
+++ b/config-s390x
@@ -62,9 +62,9 @@ CONFIG_SCLP_TTY=y
CONFIG_SCLP_CONSOLE=y
CONFIG_SCLP_VT220_TTY=y
CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_SCLP_CPI=m
CONFIG_SCLP_ASYNC=m
CONFIG_SCLP_ASYNC_ID="000000000"
+CONFIG_SCLP_OFB=y
CONFIG_S390_TAPE=m
CONFIG_S390_TAPE_3590=m