aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2019-10-04 09:05:03 -0400
committerVasily Gorbik <gor@linux.ibm.com>2019-10-04 10:37:33 -0400
commit61c313471574de93c63868689d42cd9fff297a1a (patch)
tree1b59a559c3d1538dc4908854d76fb3619480445d /arch/s390
parent771c24f6da06042e8aa8303e37c069fa01f96a09 (diff)
s390: update defconfigs
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/configs/debug_defconfig24
-rw-r--r--arch/s390/configs/defconfig25
-rw-r--r--arch/s390/configs/zfcpdump_defconfig2
3 files changed, 33 insertions, 18 deletions
diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig
index 347f48702edb..38d64030aacf 100644
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@ -44,6 +44,7 @@ CONFIG_NR_CPUS=512
44CONFIG_NUMA=y 44CONFIG_NUMA=y
45CONFIG_HZ_100=y 45CONFIG_HZ_100=y
46CONFIG_KEXEC_FILE=y 46CONFIG_KEXEC_FILE=y
47CONFIG_KEXEC_SIG=y
47CONFIG_EXPOLINE=y 48CONFIG_EXPOLINE=y
48CONFIG_EXPOLINE_AUTO=y 49CONFIG_EXPOLINE_AUTO=y
49CONFIG_CHSC_SCH=y 50CONFIG_CHSC_SCH=y
@@ -69,12 +70,13 @@ CONFIG_MODULE_UNLOAD=y
69CONFIG_MODULE_FORCE_UNLOAD=y 70CONFIG_MODULE_FORCE_UNLOAD=y
70CONFIG_MODVERSIONS=y 71CONFIG_MODVERSIONS=y
71CONFIG_MODULE_SRCVERSION_ALL=y 72CONFIG_MODULE_SRCVERSION_ALL=y
72CONFIG_MODULE_SIG=y
73CONFIG_MODULE_SIG_SHA256=y 73CONFIG_MODULE_SIG_SHA256=y
74CONFIG_UNUSED_SYMBOLS=y
74CONFIG_BLK_DEV_INTEGRITY=y 75CONFIG_BLK_DEV_INTEGRITY=y
75CONFIG_BLK_DEV_THROTTLING=y 76CONFIG_BLK_DEV_THROTTLING=y
76CONFIG_BLK_WBT=y 77CONFIG_BLK_WBT=y
77CONFIG_BLK_CGROUP_IOLATENCY=y 78CONFIG_BLK_CGROUP_IOLATENCY=y
79CONFIG_BLK_CGROUP_IOCOST=y
78CONFIG_PARTITION_ADVANCED=y 80CONFIG_PARTITION_ADVANCED=y
79CONFIG_IBM_PARTITION=y 81CONFIG_IBM_PARTITION=y
80CONFIG_BSD_DISKLABEL=y 82CONFIG_BSD_DISKLABEL=y
@@ -370,6 +372,7 @@ CONFIG_NETLINK_DIAG=m
370CONFIG_CGROUP_NET_PRIO=y 372CONFIG_CGROUP_NET_PRIO=y
371CONFIG_BPF_JIT=y 373CONFIG_BPF_JIT=y
372CONFIG_NET_PKTGEN=m 374CONFIG_NET_PKTGEN=m
375# CONFIG_NET_DROP_MONITOR is not set
373CONFIG_PCI=y 376CONFIG_PCI=y
374CONFIG_PCI_DEBUG=y 377CONFIG_PCI_DEBUG=y
375CONFIG_HOTPLUG_PCI=y 378CONFIG_HOTPLUG_PCI=y
@@ -424,6 +427,7 @@ CONFIG_DM_CRYPT=m
424CONFIG_DM_SNAPSHOT=m 427CONFIG_DM_SNAPSHOT=m
425CONFIG_DM_THIN_PROVISIONING=m 428CONFIG_DM_THIN_PROVISIONING=m
426CONFIG_DM_WRITECACHE=m 429CONFIG_DM_WRITECACHE=m
430CONFIG_DM_CLONE=m
427CONFIG_DM_MIRROR=m 431CONFIG_DM_MIRROR=m
428CONFIG_DM_LOG_USERSPACE=m 432CONFIG_DM_LOG_USERSPACE=m
429CONFIG_DM_RAID=m 433CONFIG_DM_RAID=m
@@ -435,6 +439,7 @@ CONFIG_DM_DELAY=m
435CONFIG_DM_UEVENT=y 439CONFIG_DM_UEVENT=y
436CONFIG_DM_FLAKEY=m 440CONFIG_DM_FLAKEY=m
437CONFIG_DM_VERITY=m 441CONFIG_DM_VERITY=m
442CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
438CONFIG_DM_SWITCH=m 443CONFIG_DM_SWITCH=m
439CONFIG_NETDEVICES=y 444CONFIG_NETDEVICES=y
440CONFIG_BONDING=m 445CONFIG_BONDING=m
@@ -489,6 +494,7 @@ CONFIG_MLX5_CORE_EN=y
489# CONFIG_NET_VENDOR_NVIDIA is not set 494# CONFIG_NET_VENDOR_NVIDIA is not set
490# CONFIG_NET_VENDOR_OKI is not set 495# CONFIG_NET_VENDOR_OKI is not set
491# CONFIG_NET_VENDOR_PACKET_ENGINES is not set 496# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
497# CONFIG_NET_VENDOR_PENSANDO is not set
492# CONFIG_NET_VENDOR_QLOGIC is not set 498# CONFIG_NET_VENDOR_QLOGIC is not set
493# CONFIG_NET_VENDOR_QUALCOMM is not set 499# CONFIG_NET_VENDOR_QUALCOMM is not set
494# CONFIG_NET_VENDOR_RDC is not set 500# CONFIG_NET_VENDOR_RDC is not set
@@ -538,15 +544,16 @@ CONFIG_WATCHDOG=y
538CONFIG_WATCHDOG_NOWAYOUT=y 544CONFIG_WATCHDOG_NOWAYOUT=y
539CONFIG_SOFT_WATCHDOG=m 545CONFIG_SOFT_WATCHDOG=m
540CONFIG_DIAG288_WATCHDOG=m 546CONFIG_DIAG288_WATCHDOG=m
541CONFIG_DRM=y 547CONFIG_FB=y
542CONFIG_DRM_VIRTIO_GPU=y
543CONFIG_FRAMEBUFFER_CONSOLE=y 548CONFIG_FRAMEBUFFER_CONSOLE=y
549CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
544# CONFIG_HID is not set 550# CONFIG_HID is not set
545# CONFIG_USB_SUPPORT is not set 551# CONFIG_USB_SUPPORT is not set
546CONFIG_INFINIBAND=m 552CONFIG_INFINIBAND=m
547CONFIG_INFINIBAND_USER_ACCESS=m 553CONFIG_INFINIBAND_USER_ACCESS=m
548CONFIG_MLX4_INFINIBAND=m 554CONFIG_MLX4_INFINIBAND=m
549CONFIG_MLX5_INFINIBAND=m 555CONFIG_MLX5_INFINIBAND=m
556CONFIG_SYNC_FILE=y
550CONFIG_VFIO=m 557CONFIG_VFIO=m
551CONFIG_VFIO_PCI=m 558CONFIG_VFIO_PCI=m
552CONFIG_VFIO_MDEV=m 559CONFIG_VFIO_MDEV=m
@@ -580,6 +587,8 @@ CONFIG_NILFS2_FS=m
580CONFIG_FS_DAX=y 587CONFIG_FS_DAX=y
581CONFIG_EXPORTFS_BLOCK_OPS=y 588CONFIG_EXPORTFS_BLOCK_OPS=y
582CONFIG_FS_ENCRYPTION=y 589CONFIG_FS_ENCRYPTION=y
590CONFIG_FS_VERITY=y
591CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
583CONFIG_FANOTIFY=y 592CONFIG_FANOTIFY=y
584CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 593CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
585CONFIG_QUOTA_NETLINK_INTERFACE=y 594CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -589,6 +598,7 @@ CONFIG_QFMT_V2=m
589CONFIG_AUTOFS4_FS=m 598CONFIG_AUTOFS4_FS=m
590CONFIG_FUSE_FS=y 599CONFIG_FUSE_FS=y
591CONFIG_CUSE=m 600CONFIG_CUSE=m
601CONFIG_VIRTIO_FS=m
592CONFIG_OVERLAY_FS=m 602CONFIG_OVERLAY_FS=m
593CONFIG_FSCACHE=m 603CONFIG_FSCACHE=m
594CONFIG_CACHEFILES=m 604CONFIG_CACHEFILES=m
@@ -648,12 +658,15 @@ CONFIG_FORTIFY_SOURCE=y
648CONFIG_SECURITY_SELINUX=y 658CONFIG_SECURITY_SELINUX=y
649CONFIG_SECURITY_SELINUX_BOOTPARAM=y 659CONFIG_SECURITY_SELINUX_BOOTPARAM=y
650CONFIG_SECURITY_SELINUX_DISABLE=y 660CONFIG_SECURITY_SELINUX_DISABLE=y
661CONFIG_SECURITY_LOCKDOWN_LSM=y
662CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
651CONFIG_INTEGRITY_SIGNATURE=y 663CONFIG_INTEGRITY_SIGNATURE=y
652CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y 664CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
653CONFIG_IMA=y 665CONFIG_IMA=y
654CONFIG_IMA_DEFAULT_HASH_SHA256=y 666CONFIG_IMA_DEFAULT_HASH_SHA256=y
655CONFIG_IMA_WRITE_POLICY=y 667CONFIG_IMA_WRITE_POLICY=y
656CONFIG_IMA_APPRAISE=y 668CONFIG_IMA_APPRAISE=y
669CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
657CONFIG_CRYPTO_USER=m 670CONFIG_CRYPTO_USER=m
658# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 671# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
659CONFIG_CRYPTO_PCRYPT=m 672CONFIG_CRYPTO_PCRYPT=m
@@ -664,10 +677,6 @@ CONFIG_CRYPTO_ECDH=m
664CONFIG_CRYPTO_ECRDSA=m 677CONFIG_CRYPTO_ECRDSA=m
665CONFIG_CRYPTO_CHACHA20POLY1305=m 678CONFIG_CRYPTO_CHACHA20POLY1305=m
666CONFIG_CRYPTO_AEGIS128=m 679CONFIG_CRYPTO_AEGIS128=m
667CONFIG_CRYPTO_AEGIS128L=m
668CONFIG_CRYPTO_AEGIS256=m
669CONFIG_CRYPTO_MORUS640=m
670CONFIG_CRYPTO_MORUS1280=m
671CONFIG_CRYPTO_CFB=m 680CONFIG_CRYPTO_CFB=m
672CONFIG_CRYPTO_LRW=m 681CONFIG_CRYPTO_LRW=m
673CONFIG_CRYPTO_PCBC=m 682CONFIG_CRYPTO_PCBC=m
@@ -739,7 +748,6 @@ CONFIG_DEBUG_INFO=y
739CONFIG_DEBUG_INFO_DWARF4=y 748CONFIG_DEBUG_INFO_DWARF4=y
740CONFIG_GDB_SCRIPTS=y 749CONFIG_GDB_SCRIPTS=y
741CONFIG_FRAME_WARN=1024 750CONFIG_FRAME_WARN=1024
742CONFIG_UNUSED_SYMBOLS=y
743CONFIG_HEADERS_INSTALL=y 751CONFIG_HEADERS_INSTALL=y
744CONFIG_HEADERS_CHECK=y 752CONFIG_HEADERS_CHECK=y
745CONFIG_DEBUG_SECTION_MISMATCH=y 753CONFIG_DEBUG_SECTION_MISMATCH=y
diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig
index 8514b8b9500f..25f799849582 100644
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
@@ -44,6 +44,7 @@ CONFIG_NUMA=y
44# CONFIG_NUMA_EMU is not set 44# CONFIG_NUMA_EMU is not set
45CONFIG_HZ_100=y 45CONFIG_HZ_100=y
46CONFIG_KEXEC_FILE=y 46CONFIG_KEXEC_FILE=y
47CONFIG_KEXEC_SIG=y
47CONFIG_EXPOLINE=y 48CONFIG_EXPOLINE=y
48CONFIG_EXPOLINE_AUTO=y 49CONFIG_EXPOLINE_AUTO=y
49CONFIG_CHSC_SCH=y 50CONFIG_CHSC_SCH=y
@@ -66,11 +67,12 @@ CONFIG_MODULE_UNLOAD=y
66CONFIG_MODULE_FORCE_UNLOAD=y 67CONFIG_MODULE_FORCE_UNLOAD=y
67CONFIG_MODVERSIONS=y 68CONFIG_MODVERSIONS=y
68CONFIG_MODULE_SRCVERSION_ALL=y 69CONFIG_MODULE_SRCVERSION_ALL=y
69CONFIG_MODULE_SIG=y
70CONFIG_MODULE_SIG_SHA256=y 70CONFIG_MODULE_SIG_SHA256=y
71CONFIG_UNUSED_SYMBOLS=y
71CONFIG_BLK_DEV_THROTTLING=y 72CONFIG_BLK_DEV_THROTTLING=y
72CONFIG_BLK_WBT=y 73CONFIG_BLK_WBT=y
73CONFIG_BLK_CGROUP_IOLATENCY=y 74CONFIG_BLK_CGROUP_IOLATENCY=y
75CONFIG_BLK_CGROUP_IOCOST=y
74CONFIG_PARTITION_ADVANCED=y 76CONFIG_PARTITION_ADVANCED=y
75CONFIG_IBM_PARTITION=y 77CONFIG_IBM_PARTITION=y
76CONFIG_BSD_DISKLABEL=y 78CONFIG_BSD_DISKLABEL=y
@@ -363,6 +365,7 @@ CONFIG_NETLINK_DIAG=m
363CONFIG_CGROUP_NET_PRIO=y 365CONFIG_CGROUP_NET_PRIO=y
364CONFIG_BPF_JIT=y 366CONFIG_BPF_JIT=y
365CONFIG_NET_PKTGEN=m 367CONFIG_NET_PKTGEN=m
368# CONFIG_NET_DROP_MONITOR is not set
366CONFIG_PCI=y 369CONFIG_PCI=y
367CONFIG_HOTPLUG_PCI=y 370CONFIG_HOTPLUG_PCI=y
368CONFIG_HOTPLUG_PCI_S390=y 371CONFIG_HOTPLUG_PCI_S390=y
@@ -418,6 +421,7 @@ CONFIG_DM_CRYPT=m
418CONFIG_DM_SNAPSHOT=m 421CONFIG_DM_SNAPSHOT=m
419CONFIG_DM_THIN_PROVISIONING=m 422CONFIG_DM_THIN_PROVISIONING=m
420CONFIG_DM_WRITECACHE=m 423CONFIG_DM_WRITECACHE=m
424CONFIG_DM_CLONE=m
421CONFIG_DM_MIRROR=m 425CONFIG_DM_MIRROR=m
422CONFIG_DM_LOG_USERSPACE=m 426CONFIG_DM_LOG_USERSPACE=m
423CONFIG_DM_RAID=m 427CONFIG_DM_RAID=m
@@ -429,6 +433,7 @@ CONFIG_DM_DELAY=m
429CONFIG_DM_UEVENT=y 433CONFIG_DM_UEVENT=y
430CONFIG_DM_FLAKEY=m 434CONFIG_DM_FLAKEY=m
431CONFIG_DM_VERITY=m 435CONFIG_DM_VERITY=m
436CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
432CONFIG_DM_SWITCH=m 437CONFIG_DM_SWITCH=m
433CONFIG_DM_INTEGRITY=m 438CONFIG_DM_INTEGRITY=m
434CONFIG_NETDEVICES=y 439CONFIG_NETDEVICES=y
@@ -484,6 +489,7 @@ CONFIG_MLX5_CORE_EN=y
484# CONFIG_NET_VENDOR_NVIDIA is not set 489# CONFIG_NET_VENDOR_NVIDIA is not set
485# CONFIG_NET_VENDOR_OKI is not set 490# CONFIG_NET_VENDOR_OKI is not set
486# CONFIG_NET_VENDOR_PACKET_ENGINES is not set 491# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
492# CONFIG_NET_VENDOR_PENSANDO is not set
487# CONFIG_NET_VENDOR_QLOGIC is not set 493# CONFIG_NET_VENDOR_QLOGIC is not set
488# CONFIG_NET_VENDOR_QUALCOMM is not set 494# CONFIG_NET_VENDOR_QUALCOMM is not set
489# CONFIG_NET_VENDOR_RDC is not set 495# CONFIG_NET_VENDOR_RDC is not set
@@ -533,16 +539,16 @@ CONFIG_WATCHDOG_CORE=y
533CONFIG_WATCHDOG_NOWAYOUT=y 539CONFIG_WATCHDOG_NOWAYOUT=y
534CONFIG_SOFT_WATCHDOG=m 540CONFIG_SOFT_WATCHDOG=m
535CONFIG_DIAG288_WATCHDOG=m 541CONFIG_DIAG288_WATCHDOG=m
536CONFIG_DRM=y 542CONFIG_FB=y
537CONFIG_DRM_VIRTIO_GPU=y
538# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
539CONFIG_FRAMEBUFFER_CONSOLE=y 543CONFIG_FRAMEBUFFER_CONSOLE=y
544CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
540# CONFIG_HID is not set 545# CONFIG_HID is not set
541# CONFIG_USB_SUPPORT is not set 546# CONFIG_USB_SUPPORT is not set
542CONFIG_INFINIBAND=m 547CONFIG_INFINIBAND=m
543CONFIG_INFINIBAND_USER_ACCESS=m 548CONFIG_INFINIBAND_USER_ACCESS=m
544CONFIG_MLX4_INFINIBAND=m 549CONFIG_MLX4_INFINIBAND=m
545CONFIG_MLX5_INFINIBAND=m 550CONFIG_MLX5_INFINIBAND=m
551CONFIG_SYNC_FILE=y
546CONFIG_VFIO=m 552CONFIG_VFIO=m
547CONFIG_VFIO_PCI=m 553CONFIG_VFIO_PCI=m
548CONFIG_VFIO_MDEV=m 554CONFIG_VFIO_MDEV=m
@@ -573,6 +579,8 @@ CONFIG_NILFS2_FS=m
573CONFIG_FS_DAX=y 579CONFIG_FS_DAX=y
574CONFIG_EXPORTFS_BLOCK_OPS=y 580CONFIG_EXPORTFS_BLOCK_OPS=y
575CONFIG_FS_ENCRYPTION=y 581CONFIG_FS_ENCRYPTION=y
582CONFIG_FS_VERITY=y
583CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
576CONFIG_FANOTIFY=y 584CONFIG_FANOTIFY=y
577CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 585CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
578CONFIG_QUOTA_NETLINK_INTERFACE=y 586CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -581,6 +589,7 @@ CONFIG_QFMT_V2=m
581CONFIG_AUTOFS4_FS=m 589CONFIG_AUTOFS4_FS=m
582CONFIG_FUSE_FS=y 590CONFIG_FUSE_FS=y
583CONFIG_CUSE=m 591CONFIG_CUSE=m
592CONFIG_VIRTIO_FS=m
584CONFIG_OVERLAY_FS=m 593CONFIG_OVERLAY_FS=m
585CONFIG_FSCACHE=m 594CONFIG_FSCACHE=m
586CONFIG_CACHEFILES=m 595CONFIG_CACHEFILES=m
@@ -639,12 +648,15 @@ CONFIG_SECURITY_NETWORK=y
639CONFIG_SECURITY_SELINUX=y 648CONFIG_SECURITY_SELINUX=y
640CONFIG_SECURITY_SELINUX_BOOTPARAM=y 649CONFIG_SECURITY_SELINUX_BOOTPARAM=y
641CONFIG_SECURITY_SELINUX_DISABLE=y 650CONFIG_SECURITY_SELINUX_DISABLE=y
651CONFIG_SECURITY_LOCKDOWN_LSM=y
652CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
642CONFIG_INTEGRITY_SIGNATURE=y 653CONFIG_INTEGRITY_SIGNATURE=y
643CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y 654CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
644CONFIG_IMA=y 655CONFIG_IMA=y
645CONFIG_IMA_DEFAULT_HASH_SHA256=y 656CONFIG_IMA_DEFAULT_HASH_SHA256=y
646CONFIG_IMA_WRITE_POLICY=y 657CONFIG_IMA_WRITE_POLICY=y
647CONFIG_IMA_APPRAISE=y 658CONFIG_IMA_APPRAISE=y
659CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
648CONFIG_CRYPTO_FIPS=y 660CONFIG_CRYPTO_FIPS=y
649CONFIG_CRYPTO_USER=m 661CONFIG_CRYPTO_USER=m
650# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set 662# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -656,10 +668,6 @@ CONFIG_CRYPTO_ECDH=m
656CONFIG_CRYPTO_ECRDSA=m 668CONFIG_CRYPTO_ECRDSA=m
657CONFIG_CRYPTO_CHACHA20POLY1305=m 669CONFIG_CRYPTO_CHACHA20POLY1305=m
658CONFIG_CRYPTO_AEGIS128=m 670CONFIG_CRYPTO_AEGIS128=m
659CONFIG_CRYPTO_AEGIS128L=m
660CONFIG_CRYPTO_AEGIS256=m
661CONFIG_CRYPTO_MORUS640=m
662CONFIG_CRYPTO_MORUS1280=m
663CONFIG_CRYPTO_CFB=m 671CONFIG_CRYPTO_CFB=m
664CONFIG_CRYPTO_LRW=m 672CONFIG_CRYPTO_LRW=m
665CONFIG_CRYPTO_OFB=m 673CONFIG_CRYPTO_OFB=m
@@ -727,7 +735,6 @@ CONFIG_DEBUG_INFO=y
727CONFIG_DEBUG_INFO_DWARF4=y 735CONFIG_DEBUG_INFO_DWARF4=y
728CONFIG_GDB_SCRIPTS=y 736CONFIG_GDB_SCRIPTS=y
729CONFIG_FRAME_WARN=1024 737CONFIG_FRAME_WARN=1024
730CONFIG_UNUSED_SYMBOLS=y
731CONFIG_DEBUG_SECTION_MISMATCH=y 738CONFIG_DEBUG_SECTION_MISMATCH=y
732CONFIG_MAGIC_SYSRQ=y 739CONFIG_MAGIC_SYSRQ=y
733CONFIG_DEBUG_MEMORY_INIT=y 740CONFIG_DEBUG_MEMORY_INIT=y
diff --git a/arch/s390/configs/zfcpdump_defconfig b/arch/s390/configs/zfcpdump_defconfig
index be09a208b608..20c51e5d9353 100644
--- a/arch/s390/configs/zfcpdump_defconfig
+++ b/arch/s390/configs/zfcpdump_defconfig
@@ -61,7 +61,7 @@ CONFIG_RAW_DRIVER=y
61CONFIG_CONFIGFS_FS=y 61CONFIG_CONFIGFS_FS=y
62# CONFIG_MISC_FILESYSTEMS is not set 62# CONFIG_MISC_FILESYSTEMS is not set
63# CONFIG_NETWORK_FILESYSTEMS is not set 63# CONFIG_NETWORK_FILESYSTEMS is not set
64# CONFIG_DIMLIB is not set 64CONFIG_LSM="yama,loadpin,safesetid,integrity"
65CONFIG_PRINTK_TIME=y 65CONFIG_PRINTK_TIME=y
66CONFIG_DEBUG_INFO=y 66CONFIG_DEBUG_INFO=y
67CONFIG_DEBUG_FS=y 67CONFIG_DEBUG_FS=y