Commit 3a47b1e3 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: Update defconfigs 



Just the regular update of all defconfigs.

Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 833542b3

arch/s390/configs/debug_defconfig

+5 −9
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_USER_NS=y 
CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC=y

CONFIG_KEXEC_FILE=y
@@ -92,7 +91,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

CONFIG_SLUB_STATS=y
@@ -668,7 +666,6 @@ CONFIG_NILFS2_FS=m 
CONFIG_BCACHEFS_FS=y

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y
@@ -738,11 +735,10 @@ CONFIG_NLS_UTF8=m 
CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_LOCKDOWN_LSM=y
@@ -755,6 +751,8 @@ CONFIG_IMA=y 
CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
@@ -770,7 +768,6 @@ CONFIG_CRYPTO_AES_TI=m 
CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m
@@ -815,7 +812,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m 
CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_HMAC_S390=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m
@@ -826,9 +822,9 @@ CONFIG_PKEY_UV=m 
CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

CONFIG_CRYPTO_KRB5_SELFTESTS=y

CONFIG_CORDIC=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_RANDOM32_SELFTEST=y

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_DMA_CMA=y

arch/s390/configs/defconfig

+3 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_USER_NS=y 
CONFIG_CHECKPOINT_RESTORE=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_PROFILING=y

CONFIG_KEXEC=y

CONFIG_KEXEC_FILE=y
@@ -86,7 +85,6 @@ CONFIG_UNIXWARE_DISKLABEL=y 
CONFIG_IOSCHED_BFQ=y

CONFIG_BINFMT_MISC=m

CONFIG_ZSWAP=y

CONFIG_ZSMALLOC=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

# CONFIG_COMPAT_BRK is not set
@@ -655,7 +653,6 @@ CONFIG_NILFS2_FS=m 
CONFIG_BCACHEFS_FS=m

CONFIG_BCACHEFS_QUOTA=y

CONFIG_BCACHEFS_POSIX_ACL=y

CONFIG_FS_DAX=y

CONFIG_EXPORTFS_BLOCK_OPS=y

CONFIG_FS_ENCRYPTION=y

CONFIG_FS_VERITY=y
@@ -725,6 +722,7 @@ CONFIG_NLS_UTF8=m 
CONFIG_DLM=m

CONFIG_UNICODE=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y
@@ -756,7 +754,6 @@ CONFIG_CRYPTO_AES_TI=m 
CONFIG_CRYPTO_ANUBIS=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m
@@ -802,7 +799,6 @@ CONFIG_CRYPTO_SHA3_512_S390=m 
CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_DES_S390=m

CONFIG_CRYPTO_CHACHA_S390=m

CONFIG_CRYPTO_HMAC_S390=m

CONFIG_ZCRYPT=m

CONFIG_PKEY=m
@@ -813,10 +809,10 @@ CONFIG_PKEY_UV=m 
CONFIG_CRYPTO_PAES_S390=m

CONFIG_CRYPTO_DEV_VIRTIO=m

CONFIG_SYSTEM_BLACKLIST_KEYRING=y

CONFIG_CRYPTO_KRB5=m

CONFIG_CRYPTO_KRB5_SELFTESTS=y

CONFIG_CORDIC=m

CONFIG_PRIME_NUMBERS=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_FS=y

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_RCU_CPU_STALL_TIMEOUT=60

# CONFIG_RCU_TRACE is not set

# CONFIG_FTRACE is not set