Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f95a0d6a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge commit '8e8320c9' into for-4.13/block 



Pull in the fix for shared tags, as it conflicts with the pending
changes in for-4.13/block. We already pulled in v4.12-rc5 to solve
other conflicts or get fixes that went into 4.12, so not a lot
of changes in this merge.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents a9590fe1 8e8320c9

arch/s390/configs/default_defconfig

+33 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ CONFIG_USER_NS=y 
CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set
@@ -44,7 +45,10 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_WBT_SQ=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y
@@ -90,6 +94,8 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -359,6 +365,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_NETLINK_DIAG=m

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m
@@ -367,16 +374,19 @@ CONFIG_DEVTMPFS=y 
CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_BLK_DEV_RAM_DAX=y

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_RBD=m

CONFIG_ENCLOSURE_SERVICES=m

CONFIG_GENWQE=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -442,6 +452,8 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m
@@ -452,7 +464,6 @@ CONFIG_PPTP=m 
CONFIG_PPPOL2TP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set
@@ -471,6 +482,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -487,12 +499,18 @@ CONFIG_XFS_POSIX_ACL=y 
CONFIG_XFS_RT=y

CONFIG_XFS_DEBUG=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_BTRFS_DEBUG=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QUOTA_DEBUG=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m

CONFIG_AUTOFS4_FS=m
@@ -558,6 +576,7 @@ CONFIG_HEADERS_CHECK=y 
CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_RODATA_TEST=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS_SELFTEST=y

CONFIG_DEBUG_OBJECTS_FREE=y
@@ -580,7 +599,6 @@ CONFIG_DETECT_HUNG_TASK=y 
CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

CONFIG_PROVE_LOCKING=y
@@ -595,6 +613,7 @@ CONFIG_RCU_TORTURE_TEST=m 
CONFIG_RCU_CPU_STALL_TIMEOUT=300

CONFIG_NOTIFIER_ERROR_INJECTION=m

CONFIG_PM_NOTIFIER_ERROR_INJECT=m

CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

CONFIG_FAULT_INJECTION=y

CONFIG_FAILSLAB=y

CONFIG_FAIL_PAGE_ALLOC=y
@@ -616,13 +635,12 @@ CONFIG_HIST_TRIGGERS=y 
CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y

CONFIG_TEST_SORT=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_RBTREE_TEST=y

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_STRING_HELPERS=y

CONFIG_TEST_KSTRTOX=y

CONFIG_DMA_API_DEBUG=y

CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -630,6 +648,7 @@ CONFIG_S390_PTDUMP=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -640,7 +659,9 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_PCRYPT=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_CCM=m

CONFIG_CRYPTO_GCM=m
@@ -648,6 +669,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -657,8 +679,10 @@ CONFIG_CRYPTO_RMD160=m 
CONFIG_CRYPTO_RMD256=m

CONFIG_CRYPTO_RMD320=m

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m
@@ -674,6 +698,7 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m
@@ -685,6 +710,7 @@ CONFIG_CRYPTO_SHA256_S390=m 
CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y
@@ -692,6 +718,7 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m 
CONFIG_X509_CERTIFICATE_PARSER=m

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_RANDOM32_SELFTEST=y

CONFIG_CORDIC=m

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

arch/s390/configs/gcov_defconfig

+24 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ CONFIG_USER_NS=y 
CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set
@@ -46,7 +47,10 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_WBT_SQ=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y
@@ -88,6 +92,8 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -356,6 +362,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_NETLINK_DIAG=m

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m
@@ -364,16 +371,18 @@ CONFIG_DEVTMPFS=y 
CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_BLK_DEV_RAM_DAX=y

CONFIG_VIRTIO_BLK=y

CONFIG_ENCLOSURE_SERVICES=m

CONFIG_GENWQE=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -439,6 +448,8 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m
@@ -449,7 +460,6 @@ CONFIG_PPTP=m 
CONFIG_PPPOL2TP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set
@@ -468,6 +478,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -483,11 +494,15 @@ CONFIG_XFS_QUOTA=y 
CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m
@@ -553,7 +568,6 @@ CONFIG_UNUSED_SYMBOLS=y 
CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y
@@ -576,6 +590,7 @@ CONFIG_BIG_KEYS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -599,6 +614,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -611,6 +627,7 @@ CONFIG_CRYPTO_SHA512=m 
CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m
@@ -626,16 +643,19 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRC7=m

arch/s390/configs/performance_defconfig

+23 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ CONFIG_USER_NS=y 
CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set
@@ -44,7 +45,10 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SRCVERSION_ALL=y

CONFIG_BLK_DEV_INTEGRITY=y

CONFIG_BLK_DEV_THROTTLING=y

CONFIG_BLK_WBT=y

CONFIG_BLK_WBT_SQ=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IBM_PARTITION=y

CONFIG_BSD_DISKLABEL=y
@@ -86,6 +90,8 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=m

CONFIG_XFRM_USER=m

CONFIG_NET_KEY=m

CONFIG_SMC=m

CONFIG_SMC_DIAG=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -354,6 +360,7 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_NETLINK_DIAG=m

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m
@@ -362,16 +369,18 @@ CONFIG_DEVTMPFS=y 
CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

CONFIG_CONNECTOR=y

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_OSD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_BLK_DEV_RAM_DAX=y

CONFIG_VIRTIO_BLK=y

CONFIG_ENCLOSURE_SERVICES=m

CONFIG_GENWQE=m

CONFIG_RAID_ATTRS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y
@@ -437,6 +446,8 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_PPP=m

CONFIG_PPP_BSDCOMP=m
@@ -447,7 +458,6 @@ CONFIG_PPTP=m 
CONFIG_PPPOL2TP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set
@@ -466,6 +476,7 @@ CONFIG_DIAG288_WATCHDOG=m 
CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y
@@ -481,11 +492,15 @@ CONFIG_XFS_QUOTA=y 
CONFIG_XFS_POSIX_ACL=y

CONFIG_XFS_RT=y

CONFIG_GFS2_FS=m

CONFIG_GFS2_FS_LOCKING_DLM=y

CONFIG_OCFS2_FS=m

CONFIG_BTRFS_FS=y

CONFIG_BTRFS_FS_POSIX_ACL=y

CONFIG_NILFS2_FS=m

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FANOTIFY=y

CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y

CONFIG_QUOTA_NETLINK_INTERFACE=y

CONFIG_QFMT_V1=m

CONFIG_QFMT_V2=m
@@ -551,7 +566,6 @@ CONFIG_UNUSED_SYMBOLS=y 
CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_TIMER_STATS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y
@@ -574,6 +588,7 @@ CONFIG_BIG_KEYS=y 
CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
@@ -597,6 +612,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_CMAC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m
@@ -609,6 +625,7 @@ CONFIG_CRYPTO_SHA512=m 
CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_TGR192=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m
@@ -624,6 +641,7 @@ CONFIG_CRYPTO_TWOFISH=m 
CONFIG_CRYPTO_842=m

CONFIG_CRYPTO_LZ4=m

CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m
@@ -635,6 +653,7 @@ CONFIG_CRYPTO_SHA256_S390=m 
CONFIG_CRYPTO_SHA512_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_CRC7=m

arch/s390/configs/zfcpdump_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ CONFIG_TUNE_ZEC12=y 
CONFIG_NR_CPUS=2

# CONFIG_HOTPLUG_CPU is not set

CONFIG_HZ_100=y

# CONFIG_ARCH_RANDOM is not set

# CONFIG_COMPACTION is not set

# CONFIG_MIGRATION is not set

# CONFIG_BOUNCE is not set

# CONFIG_CHECK_STACK is not set

# CONFIG_CHSC_SCH is not set

# CONFIG_SCM_BUS is not set
@@ -36,11 +38,11 @@ CONFIG_SCSI_CONSTANTS=y 
CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_FC_ATTRS=y

CONFIG_ZFCP=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_HVC_IUCV is not set

# CONFIG_HW_RANDOM_S390 is not set

CONFIG_RAW_DRIVER=y

# CONFIG_SCLP_ASYNC is not set

# CONFIG_HMC_DRV is not set
@@ -54,9 +56,9 @@ CONFIG_RAW_DRIVER=y 
# CONFIG_INOTIFY_USER is not set

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

arch/s390/defconfig

+3 −5
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ CONFIG_NAMESPACES=y 
CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set
@@ -108,7 +109,6 @@ CONFIG_ZFCP=y 
CONFIG_SCSI_VIRTIO=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_MD_RAID0=m

CONFIG_MD_MULTIPATH=m

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m
@@ -131,6 +131,7 @@ CONFIG_TUN=m 
CONFIG_VIRTIO_NET=y

# CONFIG_NET_VENDOR_ALACRITECH is not set

# CONFIG_NET_VENDOR_SOLARFLARE is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

CONFIG_DEVKMEM=y
@@ -162,7 +163,6 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y
@@ -172,14 +172,12 @@ CONFIG_DEBUG_LIST=y 
CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_RCU_TRACE=y

CONFIG_LATENCYTOP=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_UPROBE_EVENTS=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_TRACE_ENUM_MAP_FILE=y

CONFIG_KPROBES_SANITY_TEST=y
@@ -190,7 +188,6 @@ CONFIG_CRYPTO_CCM=m 
CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_CTS=m

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_XTS=m
@@ -230,6 +227,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m

CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_SHA1_S390=m

CONFIG_CRYPTO_SHA256_S390=m

CONFIG_CRYPTO_SHA512_S390=m