Skip to content

Commit b01b815

Browse files
hcahcaVasily Gorbik
hcahca
authored and
Vasily Gorbik
committed
s390: Update defconfigs
Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Acked-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 01c51a3 commit b01b815

3 files changed

Lines changed: 69 additions & 19 deletions

File tree

‎arch/s390/configs/debug_defconfig‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ CONFIG_PROFILING=y
4343
CONFIG_KEXEC=y
4444
CONFIG_KEXEC_FILE=y
4545
CONFIG_KEXEC_SIG=y
46-
CONFIG_CRASH_DUMP=y
4746
CONFIG_LIVEPATCH=y
4847
CONFIG_MARCH_Z13=y
4948
CONFIG_NR_CPUS=512
5049
CONFIG_NUMA=y
5150
CONFIG_HZ_100=y
5251
CONFIG_CERT_STORE=y
5352
CONFIG_EXPOLINE=y
53+
# CONFIG_EXPOLINE_EXTERN is not set
5454
CONFIG_EXPOLINE_AUTO=y
5555
CONFIG_CHSC_SCH=y
5656
CONFIG_VFIO_CCW=m
@@ -76,6 +76,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
7676
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
7777
CONFIG_MODVERSIONS=y
7878
CONFIG_MODULE_SRCVERSION_ALL=y
79+
CONFIG_MODULE_SIG_SHA256=y
7980
CONFIG_BLK_DEV_THROTTLING=y
8081
CONFIG_BLK_WBT=y
8182
CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -100,7 +101,6 @@ CONFIG_MEMORY_HOTPLUG=y
100101
CONFIG_MEMORY_HOTREMOVE=y
101102
CONFIG_KSM=y
102103
CONFIG_TRANSPARENT_HUGEPAGE=y
103-
CONFIG_CMA_DEBUG=y
104104
CONFIG_CMA_DEBUGFS=y
105105
CONFIG_CMA_SYSFS=y
106106
CONFIG_CMA_AREAS=7
@@ -119,6 +119,7 @@ CONFIG_UNIX_DIAG=m
119119
CONFIG_XFRM_USER=m
120120
CONFIG_NET_KEY=m
121121
CONFIG_SMC_DIAG=m
122+
CONFIG_SMC_LO=y
122123
CONFIG_INET=y
123124
CONFIG_IP_MULTICAST=y
124125
CONFIG_IP_ADVANCED_ROUTER=y
@@ -133,7 +134,6 @@ CONFIG_IP_MROUTE=y
133134
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
134135
CONFIG_IP_PIMSM_V1=y
135136
CONFIG_IP_PIMSM_V2=y
136-
CONFIG_SYN_COOKIES=y
137137
CONFIG_NET_IPVTI=m
138138
CONFIG_INET_AH=m
139139
CONFIG_INET_ESP=m
@@ -167,6 +167,7 @@ CONFIG_BRIDGE_NETFILTER=m
167167
CONFIG_NETFILTER_NETLINK_HOOK=m
168168
CONFIG_NF_CONNTRACK=m
169169
CONFIG_NF_CONNTRACK_SECMARK=y
170+
CONFIG_NF_CONNTRACK_ZONES=y
170171
CONFIG_NF_CONNTRACK_PROCFS=y
171172
CONFIG_NF_CONNTRACK_EVENTS=y
172173
CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -183,17 +184,39 @@ CONFIG_NF_CONNTRACK_SIP=m
183184
CONFIG_NF_CONNTRACK_TFTP=m
184185
CONFIG_NF_CT_NETLINK=m
185186
CONFIG_NF_CT_NETLINK_TIMEOUT=m
187+
CONFIG_NF_CT_NETLINK_HELPER=m
188+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
186189
CONFIG_NF_TABLES=m
187190
CONFIG_NF_TABLES_INET=y
191+
CONFIG_NF_TABLES_NETDEV=y
192+
CONFIG_NFT_NUMGEN=m
188193
CONFIG_NFT_CT=m
194+
CONFIG_NFT_FLOW_OFFLOAD=m
195+
CONFIG_NFT_CONNLIMIT=m
189196
CONFIG_NFT_LOG=m
190197
CONFIG_NFT_LIMIT=m
198+
CONFIG_NFT_MASQ=m
199+
CONFIG_NFT_REDIR=m
191200
CONFIG_NFT_NAT=m
201+
CONFIG_NFT_TUNNEL=m
202+
CONFIG_NFT_QUEUE=m
203+
CONFIG_NFT_QUOTA=m
192204
CONFIG_NFT_REJECT=m
193205
CONFIG_NFT_COMPAT=m
194206
CONFIG_NFT_HASH=m
195207
CONFIG_NFT_FIB_INET=m
196-
CONFIG_NETFILTER_XTABLES_COMPAT=y
208+
CONFIG_NFT_XFRM=m
209+
CONFIG_NFT_SOCKET=m
210+
CONFIG_NFT_OSF=m
211+
CONFIG_NFT_TPROXY=m
212+
CONFIG_NFT_SYNPROXY=m
213+
CONFIG_NFT_DUP_NETDEV=m
214+
CONFIG_NFT_FWD_NETDEV=m
215+
CONFIG_NFT_FIB_NETDEV=m
216+
CONFIG_NFT_REJECT_NETDEV=m
217+
CONFIG_NF_FLOW_TABLE_INET=m
218+
CONFIG_NF_FLOW_TABLE=m
219+
CONFIG_NF_FLOW_TABLE_PROCFS=y
197220
CONFIG_NETFILTER_XT_SET=m
198221
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
199222
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
@@ -206,8 +229,10 @@ CONFIG_NETFILTER_XT_TARGET_HMARK=m
206229
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
207230
CONFIG_NETFILTER_XT_TARGET_LOG=m
208231
CONFIG_NETFILTER_XT_TARGET_MARK=m
232+
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
209233
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
210234
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
235+
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
211236
CONFIG_NETFILTER_XT_TARGET_TEE=m
212237
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
213238
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -216,6 +241,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
216241
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
217242
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
218243
CONFIG_NETFILTER_XT_MATCH_BPF=m
244+
CONFIG_NETFILTER_XT_MATCH_CGROUP=m
219245
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
220246
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
221247
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -230,6 +256,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
230256
CONFIG_NETFILTER_XT_MATCH_ESP=m
231257
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
232258
CONFIG_NETFILTER_XT_MATCH_HELPER=m
259+
CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
233260
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
234261
CONFIG_NETFILTER_XT_MATCH_IPVS=m
235262
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -247,6 +274,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
247274
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
248275
CONFIG_NETFILTER_XT_MATCH_REALM=m
249276
CONFIG_NETFILTER_XT_MATCH_RECENT=m
277+
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
250278
CONFIG_NETFILTER_XT_MATCH_STATE=m
251279
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
252280
CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -302,7 +330,6 @@ CONFIG_IP_NF_TARGET_ECN=m
302330
CONFIG_IP_NF_TARGET_TTL=m
303331
CONFIG_IP_NF_RAW=m
304332
CONFIG_IP_NF_SECURITY=m
305-
CONFIG_IP_NF_ARPTABLES=m
306333
CONFIG_IP_NF_ARPFILTER=m
307334
CONFIG_IP_NF_ARP_MANGLE=m
308335
CONFIG_NFT_FIB_IPV6=m
@@ -373,7 +400,6 @@ CONFIG_NET_ACT_POLICE=m
373400
CONFIG_NET_ACT_GACT=m
374401
CONFIG_GACT_PROB=y
375402
CONFIG_NET_ACT_MIRRED=m
376-
CONFIG_NET_ACT_IPT=m
377403
CONFIG_NET_ACT_NAT=m
378404
CONFIG_NET_ACT_PEDIT=m
379405
CONFIG_NET_ACT_SIMP=m
@@ -462,6 +488,7 @@ CONFIG_DM_VERITY=m
462488
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
463489
CONFIG_DM_SWITCH=m
464490
CONFIG_DM_INTEGRITY=m
491+
CONFIG_DM_VDO=m
465492
CONFIG_NETDEVICES=y
466493
CONFIG_BONDING=m
467494
CONFIG_DUMMY=m
@@ -574,7 +601,6 @@ CONFIG_WATCHDOG=y
574601
CONFIG_WATCHDOG_NOWAYOUT=y
575602
CONFIG_SOFT_WATCHDOG=m
576603
CONFIG_DIAG288_WATCHDOG=m
577-
# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
578604
CONFIG_FB=y
579605
# CONFIG_FB_DEVICE is not set
580606
CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -645,7 +671,6 @@ CONFIG_MSDOS_FS=m
645671
CONFIG_VFAT_FS=m
646672
CONFIG_EXFAT_FS=m
647673
CONFIG_NTFS_FS=m
648-
CONFIG_NTFS_RW=y
649674
CONFIG_PROC_KCORE=y
650675
CONFIG_TMPFS=y
651676
CONFIG_TMPFS_POSIX_ACL=y
@@ -663,6 +688,7 @@ CONFIG_SQUASHFS_XZ=y
663688
CONFIG_SQUASHFS_ZSTD=y
664689
CONFIG_ROMFS_FS=m
665690
CONFIG_NFS_FS=m
691+
CONFIG_NFS_V2=m
666692
CONFIG_NFS_V3_ACL=y
667693
CONFIG_NFS_V4=m
668694
CONFIG_NFS_SWAP=y
@@ -879,6 +905,5 @@ CONFIG_RBTREE_TEST=y
879905
CONFIG_INTERVAL_TREE_TEST=m
880906
CONFIG_PERCPU_TEST=m
881907
CONFIG_ATOMIC64_SELFTEST=y
882-
CONFIG_STRING_SELFTEST=y
883908
CONFIG_TEST_BITOPS=m
884909
CONFIG_TEST_BPF=m

‎arch/s390/configs/defconfig‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ CONFIG_PROFILING=y
4141
CONFIG_KEXEC=y
4242
CONFIG_KEXEC_FILE=y
4343
CONFIG_KEXEC_SIG=y
44-
CONFIG_CRASH_DUMP=y
4544
CONFIG_LIVEPATCH=y
4645
CONFIG_MARCH_Z13=y
4746
CONFIG_NR_CPUS=512
4847
CONFIG_NUMA=y
4948
CONFIG_HZ_100=y
5049
CONFIG_CERT_STORE=y
5150
CONFIG_EXPOLINE=y
51+
# CONFIG_EXPOLINE_EXTERN is not set
5252
CONFIG_EXPOLINE_AUTO=y
5353
CONFIG_CHSC_SCH=y
5454
CONFIG_VFIO_CCW=m
@@ -71,6 +71,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
7171
CONFIG_MODULE_UNLOAD_TAINT_TRACKING=y
7272
CONFIG_MODVERSIONS=y
7373
CONFIG_MODULE_SRCVERSION_ALL=y
74+
CONFIG_MODULE_SIG_SHA256=y
7475
CONFIG_BLK_DEV_THROTTLING=y
7576
CONFIG_BLK_WBT=y
7677
CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -110,6 +111,7 @@ CONFIG_UNIX_DIAG=m
110111
CONFIG_XFRM_USER=m
111112
CONFIG_NET_KEY=m
112113
CONFIG_SMC_DIAG=m
114+
CONFIG_SMC_LO=y
113115
CONFIG_INET=y
114116
CONFIG_IP_MULTICAST=y
115117
CONFIG_IP_ADVANCED_ROUTER=y
@@ -124,7 +126,6 @@ CONFIG_IP_MROUTE=y
124126
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
125127
CONFIG_IP_PIMSM_V1=y
126128
CONFIG_IP_PIMSM_V2=y
127-
CONFIG_SYN_COOKIES=y
128129
CONFIG_NET_IPVTI=m
129130
CONFIG_INET_AH=m
130131
CONFIG_INET_ESP=m
@@ -158,6 +159,7 @@ CONFIG_BRIDGE_NETFILTER=m
158159
CONFIG_NETFILTER_NETLINK_HOOK=m
159160
CONFIG_NF_CONNTRACK=m
160161
CONFIG_NF_CONNTRACK_SECMARK=y
162+
CONFIG_NF_CONNTRACK_ZONES=y
161163
CONFIG_NF_CONNTRACK_PROCFS=y
162164
CONFIG_NF_CONNTRACK_EVENTS=y
163165
CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -174,17 +176,39 @@ CONFIG_NF_CONNTRACK_SIP=m
174176
CONFIG_NF_CONNTRACK_TFTP=m
175177
CONFIG_NF_CT_NETLINK=m
176178
CONFIG_NF_CT_NETLINK_TIMEOUT=m
179+
CONFIG_NF_CT_NETLINK_HELPER=m
180+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
177181
CONFIG_NF_TABLES=m
178182
CONFIG_NF_TABLES_INET=y
183+
CONFIG_NF_TABLES_NETDEV=y
184+
CONFIG_NFT_NUMGEN=m
179185
CONFIG_NFT_CT=m
186+
CONFIG_NFT_FLOW_OFFLOAD=m
187+
CONFIG_NFT_CONNLIMIT=m
180188
CONFIG_NFT_LOG=m
181189
CONFIG_NFT_LIMIT=m
190+
CONFIG_NFT_MASQ=m
191+
CONFIG_NFT_REDIR=m
182192
CONFIG_NFT_NAT=m
193+
CONFIG_NFT_TUNNEL=m
194+
CONFIG_NFT_QUEUE=m
195+
CONFIG_NFT_QUOTA=m
183196
CONFIG_NFT_REJECT=m
184197
CONFIG_NFT_COMPAT=m
185198
CONFIG_NFT_HASH=m
186199
CONFIG_NFT_FIB_INET=m
187-
CONFIG_NETFILTER_XTABLES_COMPAT=y
200+
CONFIG_NFT_XFRM=m
201+
CONFIG_NFT_SOCKET=m
202+
CONFIG_NFT_OSF=m
203+
CONFIG_NFT_TPROXY=m
204+
CONFIG_NFT_SYNPROXY=m
205+
CONFIG_NFT_DUP_NETDEV=m
206+
CONFIG_NFT_FWD_NETDEV=m
207+
CONFIG_NFT_FIB_NETDEV=m
208+
CONFIG_NFT_REJECT_NETDEV=m
209+
CONFIG_NF_FLOW_TABLE_INET=m
210+
CONFIG_NF_FLOW_TABLE=m
211+
CONFIG_NF_FLOW_TABLE_PROCFS=y
188212
CONFIG_NETFILTER_XT_SET=m
189213
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
190214
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
@@ -197,8 +221,10 @@ CONFIG_NETFILTER_XT_TARGET_HMARK=m
197221
CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
198222
CONFIG_NETFILTER_XT_TARGET_LOG=m
199223
CONFIG_NETFILTER_XT_TARGET_MARK=m
224+
CONFIG_NETFILTER_XT_TARGET_NETMAP=m
200225
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
201226
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
227+
CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
202228
CONFIG_NETFILTER_XT_TARGET_TEE=m
203229
CONFIG_NETFILTER_XT_TARGET_TPROXY=m
204230
CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -207,6 +233,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
207233
CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
208234
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
209235
CONFIG_NETFILTER_XT_MATCH_BPF=m
236+
CONFIG_NETFILTER_XT_MATCH_CGROUP=m
210237
CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
211238
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
212239
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -221,6 +248,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m
221248
CONFIG_NETFILTER_XT_MATCH_ESP=m
222249
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
223250
CONFIG_NETFILTER_XT_MATCH_HELPER=m
251+
CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
224252
CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
225253
CONFIG_NETFILTER_XT_MATCH_IPVS=m
226254
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -238,6 +266,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
238266
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
239267
CONFIG_NETFILTER_XT_MATCH_REALM=m
240268
CONFIG_NETFILTER_XT_MATCH_RECENT=m
269+
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
241270
CONFIG_NETFILTER_XT_MATCH_STATE=m
242271
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
243272
CONFIG_NETFILTER_XT_MATCH_STRING=m
@@ -293,7 +322,6 @@ CONFIG_IP_NF_TARGET_ECN=m
293322
CONFIG_IP_NF_TARGET_TTL=m
294323
CONFIG_IP_NF_RAW=m
295324
CONFIG_IP_NF_SECURITY=m
296-
CONFIG_IP_NF_ARPTABLES=m
297325
CONFIG_IP_NF_ARPFILTER=m
298326
CONFIG_IP_NF_ARP_MANGLE=m
299327
CONFIG_NFT_FIB_IPV6=m
@@ -363,7 +391,6 @@ CONFIG_NET_ACT_POLICE=m
363391
CONFIG_NET_ACT_GACT=m
364392
CONFIG_GACT_PROB=y
365393
CONFIG_NET_ACT_MIRRED=m
366-
CONFIG_NET_ACT_IPT=m
367394
CONFIG_NET_ACT_NAT=m
368395
CONFIG_NET_ACT_PEDIT=m
369396
CONFIG_NET_ACT_SIMP=m
@@ -452,6 +479,7 @@ CONFIG_DM_VERITY=m
452479
CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
453480
CONFIG_DM_SWITCH=m
454481
CONFIG_DM_INTEGRITY=m
482+
CONFIG_DM_VDO=m
455483
CONFIG_NETDEVICES=y
456484
CONFIG_BONDING=m
457485
CONFIG_DUMMY=m
@@ -630,7 +658,6 @@ CONFIG_MSDOS_FS=m
630658
CONFIG_VFAT_FS=m
631659
CONFIG_EXFAT_FS=m
632660
CONFIG_NTFS_FS=m
633-
CONFIG_NTFS_RW=y
634661
CONFIG_PROC_KCORE=y
635662
CONFIG_TMPFS=y
636663
CONFIG_TMPFS_POSIX_ACL=y
@@ -649,6 +676,7 @@ CONFIG_SQUASHFS_XZ=y
649676
CONFIG_SQUASHFS_ZSTD=y
650677
CONFIG_ROMFS_FS=m
651678
CONFIG_NFS_FS=m
679+
CONFIG_NFS_V2=m
652680
CONFIG_NFS_V3_ACL=y
653681
CONFIG_NFS_V4=m
654682
CONFIG_NFS_SWAP=y

‎arch/s390/configs/zfcpdump_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,22 @@ CONFIG_BPF_SYSCALL=y
99
CONFIG_BLK_DEV_INITRD=y
1010
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1111
CONFIG_KEXEC=y
12-
CONFIG_CRASH_DUMP=y
1312
CONFIG_MARCH_Z13=y
1413
CONFIG_NR_CPUS=2
1514
CONFIG_HZ_100=y
1615
# CONFIG_CHSC_SCH is not set
1716
# CONFIG_SCM_BUS is not set
17+
# CONFIG_AP is not set
1818
# CONFIG_PFAULT is not set
1919
# CONFIG_S390_HYPFS is not set
2020
# CONFIG_VIRTUALIZATION is not set
2121
# CONFIG_S390_GUEST is not set
2222
# CONFIG_SECCOMP is not set
23-
# CONFIG_GCC_PLUGINS is not set
2423
# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set
2524
CONFIG_PARTITION_ADVANCED=y
2625
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
2726
# CONFIG_SWAP is not set
2827
# CONFIG_COMPAT_BRK is not set
29-
# CONFIG_COMPACTION is not set
30-
# CONFIG_MIGRATION is not set
3128
CONFIG_NET=y
3229
# CONFIG_IUCV is not set
3330
# CONFIG_PCPU_DEV_REFCNT is not set

0 commit comments

Comments
 (0)