Commit b4fa00fd authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: Update defconfigs 



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

arch/s390/configs/debug_defconfig

+11 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ CONFIG_NUMA=y 
CONFIG_HZ_100=y

CONFIG_CERT_STORE=y

CONFIG_EXPOLINE=y

# CONFIG_EXPOLINE_EXTERN is not set

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y

CONFIG_VFIO_CCW=m
@@ -95,6 +94,7 @@ CONFIG_BINFMT_MISC=m 
CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

CONFIG_SLUB_STATS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y
@@ -426,6 +426,13 @@ CONFIG_DEVTMPFS_SAFE=y 
# CONFIG_FW_LOADER is not set

CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_ZRAM_BACKEND_LZ4=y

CONFIG_ZRAM_BACKEND_LZ4HC=y

CONFIG_ZRAM_BACKEND_ZSTD=y

CONFIG_ZRAM_BACKEND_DEFLATE=y

CONFIG_ZRAM_BACKEND_842=y

CONFIG_ZRAM_BACKEND_LZO=y

CONFIG_ZRAM_DEF_COMP_DEFLATE=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m
@@ -486,6 +493,7 @@ CONFIG_DM_UEVENT=y 
CONFIG_DM_FLAKEY=m

CONFIG_DM_VERITY=m

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING=y

CONFIG_DM_SWITCH=m

CONFIG_DM_INTEGRITY=m

CONFIG_DM_VDO=m
@@ -535,6 +543,7 @@ CONFIG_NLMON=m 
CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_NET_VENDOR_META is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -695,6 +704,7 @@ CONFIG_NFSD=m 
CONFIG_NFSD_V3_ACL=y

CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set

CONFIG_CIFS=m

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y
@@ -740,7 +750,6 @@ CONFIG_CRYPTO_DH=m 
CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m

arch/s390/configs/defconfig

+12 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_NUMA=y 
CONFIG_HZ_100=y

CONFIG_CERT_STORE=y

CONFIG_EXPOLINE=y

# CONFIG_EXPOLINE_EXTERN is not set

CONFIG_EXPOLINE_AUTO=y

CONFIG_CHSC_SCH=y

CONFIG_VFIO_CCW=m
@@ -89,6 +88,7 @@ CONFIG_BINFMT_MISC=m 
CONFIG_ZSWAP=y

CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y

CONFIG_ZSMALLOC_STAT=y

CONFIG_SLAB_BUCKETS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y
@@ -416,6 +416,13 @@ CONFIG_DEVTMPFS_SAFE=y 
# CONFIG_FW_LOADER is not set

CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_ZRAM_BACKEND_LZ4=y

CONFIG_ZRAM_BACKEND_LZ4HC=y

CONFIG_ZRAM_BACKEND_ZSTD=y

CONFIG_ZRAM_BACKEND_DEFLATE=y

CONFIG_ZRAM_BACKEND_842=y

CONFIG_ZRAM_BACKEND_LZO=y

CONFIG_ZRAM_DEF_COMP_DEFLATE=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m
@@ -476,6 +483,7 @@ CONFIG_DM_UEVENT=y 
CONFIG_DM_FLAKEY=m

CONFIG_DM_VERITY=m

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y

CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_PLATFORM_KEYRING=y

CONFIG_DM_SWITCH=m

CONFIG_DM_INTEGRITY=m

CONFIG_DM_VDO=m
@@ -525,6 +533,7 @@ CONFIG_NLMON=m 
CONFIG_MLX4_EN=m

CONFIG_MLX5_CORE=m

CONFIG_MLX5_CORE_EN=y

# CONFIG_NET_VENDOR_META is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_MICROSEMI is not set
@@ -682,6 +691,7 @@ CONFIG_NFSD=m 
CONFIG_NFSD_V3_ACL=y

CONFIG_NFSD_V4=y

CONFIG_NFSD_V4_SECURITY_LABEL=y

# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set

CONFIG_CIFS=m

CONFIG_CIFS_UPCALL=y

CONFIG_CIFS_XATTR=y
@@ -726,7 +736,6 @@ CONFIG_CRYPTO_DH=m 
CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_SM2=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m
@@ -767,6 +776,7 @@ CONFIG_CRYPTO_LZ4=m 
CONFIG_CRYPTO_LZ4HC=m

CONFIG_CRYPTO_ZSTD=m

CONFIG_CRYPTO_ANSI_CPRNG=m

CONFIG_CRYPTO_JITTERENTROPY_OSR=1

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

arch/s390/configs/zfcpdump_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ CONFIG_ZFCP=y 
# CONFIG_HVC_IUCV is not set

# CONFIG_HW_RANDOM_S390 is not set

# CONFIG_HMC_DRV is not set

# CONFIG_S390_UV_UAPI is not set

# CONFIG_S390_TAPE is not set

# CONFIG_VMCP is not set

# CONFIG_MONWRITER is not set