Skip to content

Commit 124468a

Browse files
committed
s390/configs: update default configurations
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 027790f commit 124468a

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ CONFIG_UNIX=y
118118
CONFIG_UNIX_DIAG=m
119119
CONFIG_XFRM_USER=m
120120
CONFIG_NET_KEY=m
121-
CONFIG_SMC=m
122121
CONFIG_SMC_DIAG=m
123122
CONFIG_INET=y
124123
CONFIG_IP_MULTICAST=y
@@ -374,6 +373,7 @@ CONFIG_NET_ACT_POLICE=m
374373
CONFIG_NET_ACT_GACT=m
375374
CONFIG_GACT_PROB=y
376375
CONFIG_NET_ACT_MIRRED=m
376+
CONFIG_NET_ACT_IPT=m
377377
CONFIG_NET_ACT_NAT=m
378378
CONFIG_NET_ACT_PEDIT=m
379379
CONFIG_NET_ACT_SIMP=m
@@ -436,9 +436,6 @@ CONFIG_SCSI_DH_ALUA=m
436436
CONFIG_MD=y
437437
CONFIG_BLK_DEV_MD=y
438438
# CONFIG_MD_BITMAP_FILE is not set
439-
CONFIG_MD_LINEAR=m
440-
CONFIG_MD_MULTIPATH=m
441-
CONFIG_MD_FAULTY=m
442439
CONFIG_MD_CLUSTER=m
443440
CONFIG_BCACHE=m
444441
CONFIG_BLK_DEV_DM=y
@@ -637,7 +634,6 @@ CONFIG_FUSE_FS=y
637634
CONFIG_CUSE=m
638635
CONFIG_VIRTIO_FS=m
639636
CONFIG_OVERLAY_FS=m
640-
CONFIG_NETFS_SUPPORT=m
641637
CONFIG_NETFS_STATS=y
642638
CONFIG_FSCACHE=y
643639
CONFIG_CACHEFILES=m
@@ -738,7 +734,6 @@ CONFIG_CRYPTO_TEA=m
738734
CONFIG_CRYPTO_TWOFISH=m
739735
CONFIG_CRYPTO_ADIANTUM=m
740736
CONFIG_CRYPTO_ARC4=m
741-
CONFIG_CRYPTO_CFB=m
742737
CONFIG_CRYPTO_HCTR2=m
743738
CONFIG_CRYPTO_KEYWRAP=m
744739
CONFIG_CRYPTO_LRW=m

arch/s390/configs/defconfig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ CONFIG_UNIX=y
109109
CONFIG_UNIX_DIAG=m
110110
CONFIG_XFRM_USER=m
111111
CONFIG_NET_KEY=m
112-
CONFIG_SMC=m
113112
CONFIG_SMC_DIAG=m
114113
CONFIG_INET=y
115114
CONFIG_IP_MULTICAST=y
@@ -364,6 +363,7 @@ CONFIG_NET_ACT_POLICE=m
364363
CONFIG_NET_ACT_GACT=m
365364
CONFIG_GACT_PROB=y
366365
CONFIG_NET_ACT_MIRRED=m
366+
CONFIG_NET_ACT_IPT=m
367367
CONFIG_NET_ACT_NAT=m
368368
CONFIG_NET_ACT_PEDIT=m
369369
CONFIG_NET_ACT_SIMP=m
@@ -426,9 +426,6 @@ CONFIG_SCSI_DH_ALUA=m
426426
CONFIG_MD=y
427427
CONFIG_BLK_DEV_MD=y
428428
# CONFIG_MD_BITMAP_FILE is not set
429-
CONFIG_MD_LINEAR=m
430-
CONFIG_MD_MULTIPATH=m
431-
CONFIG_MD_FAULTY=m
432429
CONFIG_MD_CLUSTER=m
433430
CONFIG_BCACHE=m
434431
CONFIG_BLK_DEV_DM=y
@@ -622,7 +619,6 @@ CONFIG_FUSE_FS=y
622619
CONFIG_CUSE=m
623620
CONFIG_VIRTIO_FS=m
624621
CONFIG_OVERLAY_FS=m
625-
CONFIG_NETFS_SUPPORT=m
626622
CONFIG_NETFS_STATS=y
627623
CONFIG_FSCACHE=y
628624
CONFIG_CACHEFILES=m
@@ -723,11 +719,9 @@ CONFIG_CRYPTO_TEA=m
723719
CONFIG_CRYPTO_TWOFISH=m
724720
CONFIG_CRYPTO_ADIANTUM=m
725721
CONFIG_CRYPTO_ARC4=m
726-
CONFIG_CRYPTO_CFB=m
727722
CONFIG_CRYPTO_HCTR2=m
728723
CONFIG_CRYPTO_KEYWRAP=m
729724
CONFIG_CRYPTO_LRW=m
730-
CONFIG_CRYPTO_OFB=m
731725
CONFIG_CRYPTO_PCBC=m
732726
CONFIG_CRYPTO_AEGIS128=m
733727
CONFIG_CRYPTO_CHACHA20POLY1305=m

arch/s390/configs/zfcpdump_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y
88
# CONFIG_NET_NS is not set
99
CONFIG_BLK_DEV_INITRD=y
1010
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
11+
CONFIG_KEXEC=y
1112
CONFIG_CRASH_DUMP=y
1213
CONFIG_MARCH_Z13=y
1314
CONFIG_NR_CPUS=2

0 commit comments

Comments
 (0)