Commit 124468af authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/configs: update default configurations 



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

arch/s390/configs/debug_defconfig

+1 −6
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ 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
@@ -374,6 +373,7 @@ CONFIG_NET_ACT_POLICE=m 
CONFIG_NET_ACT_GACT=m

CONFIG_GACT_PROB=y

CONFIG_NET_ACT_MIRRED=m

CONFIG_NET_ACT_IPT=m

CONFIG_NET_ACT_NAT=m

CONFIG_NET_ACT_PEDIT=m

CONFIG_NET_ACT_SIMP=m
@@ -436,9 +436,6 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -637,7 +634,6 @@ CONFIG_FUSE_FS=y 
CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_NETFS_SUPPORT=m

CONFIG_NETFS_STATS=y

CONFIG_FSCACHE=y

CONFIG_CACHEFILES=m
@@ -738,7 +734,6 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

arch/s390/configs/defconfig

+1 −7
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 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
@@ -364,6 +363,7 @@ CONFIG_NET_ACT_POLICE=m 
CONFIG_NET_ACT_GACT=m

CONFIG_GACT_PROB=y

CONFIG_NET_ACT_MIRRED=m

CONFIG_NET_ACT_IPT=m

CONFIG_NET_ACT_NAT=m

CONFIG_NET_ACT_PEDIT=m

CONFIG_NET_ACT_SIMP=m
@@ -426,9 +426,6 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_MULTIPATH=m

CONFIG_MD_FAULTY=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -622,7 +619,6 @@ CONFIG_FUSE_FS=y 
CONFIG_CUSE=m

CONFIG_VIRTIO_FS=m

CONFIG_OVERLAY_FS=m

CONFIG_NETFS_SUPPORT=m

CONFIG_NETFS_STATS=y

CONFIG_FSCACHE=y

CONFIG_CACHEFILES=m
@@ -723,11 +719,9 @@ CONFIG_CRYPTO_TEA=m 
CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ARC4=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_OFB=m

CONFIG_CRYPTO_PCBC=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

arch/s390/configs/zfcpdump_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KEXEC=y

CONFIG_CRASH_DUMP=y

CONFIG_MARCH_Z13=y

CONFIG_NR_CPUS=2