aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2019-03-18 03:41:48 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-03-25 05:22:40 -0400
commit733df11cfc3614254e2b9a5c81ac205e98a90b82 (patch)
treeb165970a1d078967861e8c65c97fcd4d91783c92
parent19999a8b8782d7f887353753c3c7cb5fca2f3784 (diff)
m68k: defconfig: Update defconfigs for v5.1-rc1
Actual changes: -CONFIG_FS_ENCRYPTION=m -CONFIG_NET_DEVLINK=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_XTS=m +CONFIG_TEST_STACKINIT=m +CONFIG_TEST_VMALLOC=m +# CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_XDP_SOCKETS_DIAG=m Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig14
-rw-r--r--arch/m68k/configs/apollo_defconfig14
-rw-r--r--arch/m68k/configs/atari_defconfig14
-rw-r--r--arch/m68k/configs/bvme6000_defconfig14
-rw-r--r--arch/m68k/configs/hp300_defconfig14
-rw-r--r--arch/m68k/configs/mac_defconfig14
-rw-r--r--arch/m68k/configs/multi_defconfig14
-rw-r--r--arch/m68k/configs/mvme147_defconfig14
-rw-r--r--arch/m68k/configs/mvme16x_defconfig14
-rw-r--r--arch/m68k/configs/q40_defconfig14
-rw-r--r--arch/m68k/configs/sun3_defconfig14
-rw-r--r--arch/m68k/configs/sun3x_defconfig14
12 files changed, 72 insertions, 96 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 525421ae277d..fea392cfcf1b 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -56,6 +56,7 @@ CONFIG_TLS=m
56CONFIG_XFRM_MIGRATE=y 56CONFIG_XFRM_MIGRATE=y
57CONFIG_NET_KEY=y 57CONFIG_NET_KEY=y
58CONFIG_XDP_SOCKETS=y 58CONFIG_XDP_SOCKETS=y
59CONFIG_XDP_SOCKETS_DIAG=m
59CONFIG_INET=y 60CONFIG_INET=y
60CONFIG_IP_PNP=y 61CONFIG_IP_PNP=y
61CONFIG_IP_PNP_DHCP=y 62CONFIG_IP_PNP_DHCP=y
@@ -210,9 +211,6 @@ CONFIG_NFT_FIB_IPV4=m
210CONFIG_NF_TABLES_ARP=y 211CONFIG_NF_TABLES_ARP=y
211CONFIG_NF_FLOW_TABLE_IPV4=m 212CONFIG_NF_FLOW_TABLE_IPV4=m
212CONFIG_NF_LOG_ARP=m 213CONFIG_NF_LOG_ARP=m
213CONFIG_NFT_CHAIN_NAT_IPV4=m
214CONFIG_NFT_MASQ_IPV4=m
215CONFIG_NFT_REDIR_IPV4=m
216CONFIG_IP_NF_IPTABLES=m 214CONFIG_IP_NF_IPTABLES=m
217CONFIG_IP_NF_MATCH_AH=m 215CONFIG_IP_NF_MATCH_AH=m
218CONFIG_IP_NF_MATCH_ECN=m 216CONFIG_IP_NF_MATCH_ECN=m
@@ -234,9 +232,6 @@ CONFIG_IP_NF_ARPTABLES=m
234CONFIG_IP_NF_ARPFILTER=m 232CONFIG_IP_NF_ARPFILTER=m
235CONFIG_IP_NF_ARP_MANGLE=m 233CONFIG_IP_NF_ARP_MANGLE=m
236CONFIG_NFT_CHAIN_ROUTE_IPV6=m 234CONFIG_NFT_CHAIN_ROUTE_IPV6=m
237CONFIG_NFT_CHAIN_NAT_IPV6=m
238CONFIG_NFT_MASQ_IPV6=m
239CONFIG_NFT_REDIR_IPV6=m
240CONFIG_NFT_DUP_IPV6=m 235CONFIG_NFT_DUP_IPV6=m
241CONFIG_NFT_FIB_IPV6=m 236CONFIG_NFT_FIB_IPV6=m
242CONFIG_NF_FLOW_TABLE_IPV6=m 237CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -313,7 +308,6 @@ CONFIG_AF_KCM=m
313# CONFIG_WIRELESS is not set 308# CONFIG_WIRELESS is not set
314CONFIG_PSAMPLE=m 309CONFIG_PSAMPLE=m
315CONFIG_NET_IFE=m 310CONFIG_NET_IFE=m
316CONFIG_NET_DEVLINK=m
317# CONFIG_UEVENT_HELPER is not set 311# CONFIG_UEVENT_HELPER is not set
318CONFIG_DEVTMPFS=y 312CONFIG_DEVTMPFS=y
319CONFIG_DEVTMPFS_MOUNT=y 313CONFIG_DEVTMPFS_MOUNT=y
@@ -460,12 +454,12 @@ CONFIG_RTC_DRV_RP5C01=m
460# CONFIG_VIRTIO_MENU is not set 454# CONFIG_VIRTIO_MENU is not set
461# CONFIG_IOMMU_SUPPORT is not set 455# CONFIG_IOMMU_SUPPORT is not set
462CONFIG_DAX=m 456CONFIG_DAX=m
457# CONFIG_VALIDATE_FS_PARSER is not set
463CONFIG_EXT4_FS=y 458CONFIG_EXT4_FS=y
464CONFIG_REISERFS_FS=m 459CONFIG_REISERFS_FS=m
465CONFIG_JFS_FS=m 460CONFIG_JFS_FS=m
466CONFIG_OCFS2_FS=m 461CONFIG_OCFS2_FS=m
467# CONFIG_OCFS2_DEBUG_MASKLOG is not set 462# CONFIG_OCFS2_DEBUG_MASKLOG is not set
468CONFIG_FS_ENCRYPTION=m
469CONFIG_FANOTIFY=y 463CONFIG_FANOTIFY=y
470CONFIG_QUOTA_NETLINK_INTERFACE=y 464CONFIG_QUOTA_NETLINK_INTERFACE=y
471# CONFIG_PRINT_QUOTA_WARNING is not set 465# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -573,9 +567,11 @@ CONFIG_CRYPTO_AEGIS256=m
573CONFIG_CRYPTO_MORUS640=m 567CONFIG_CRYPTO_MORUS640=m
574CONFIG_CRYPTO_MORUS1280=m 568CONFIG_CRYPTO_MORUS1280=m
575CONFIG_CRYPTO_CFB=m 569CONFIG_CRYPTO_CFB=m
570CONFIG_CRYPTO_CTS=m
576CONFIG_CRYPTO_LRW=m 571CONFIG_CRYPTO_LRW=m
577CONFIG_CRYPTO_OFB=m 572CONFIG_CRYPTO_OFB=m
578CONFIG_CRYPTO_PCBC=m 573CONFIG_CRYPTO_PCBC=m
574CONFIG_CRYPTO_XTS=m
579CONFIG_CRYPTO_KEYWRAP=m 575CONFIG_CRYPTO_KEYWRAP=m
580CONFIG_CRYPTO_ADIANTUM=m 576CONFIG_CRYPTO_ADIANTUM=m
581CONFIG_CRYPTO_XCBC=m 577CONFIG_CRYPTO_XCBC=m
@@ -640,6 +636,7 @@ CONFIG_TEST_OVERFLOW=m
640CONFIG_TEST_RHASHTABLE=m 636CONFIG_TEST_RHASHTABLE=m
641CONFIG_TEST_HASH=m 637CONFIG_TEST_HASH=m
642CONFIG_TEST_IDA=m 638CONFIG_TEST_IDA=m
639CONFIG_TEST_VMALLOC=m
643CONFIG_TEST_USER_COPY=m 640CONFIG_TEST_USER_COPY=m
644CONFIG_TEST_BPF=m 641CONFIG_TEST_BPF=m
645CONFIG_FIND_BIT_BENCHMARK=m 642CONFIG_FIND_BIT_BENCHMARK=m
@@ -649,4 +646,5 @@ CONFIG_TEST_UDELAY=m
649CONFIG_TEST_STATIC_KEYS=m 646CONFIG_TEST_STATIC_KEYS=m
650CONFIG_TEST_KMOD=m 647CONFIG_TEST_KMOD=m
651CONFIG_TEST_MEMCAT_P=m 648CONFIG_TEST_MEMCAT_P=m
649CONFIG_TEST_STACKINIT=m
652CONFIG_EARLY_PRINTK=y 650CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index db0e654a88d5..2474d267460e 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -52,6 +52,7 @@ CONFIG_TLS=m
52CONFIG_XFRM_MIGRATE=y 52CONFIG_XFRM_MIGRATE=y
53CONFIG_NET_KEY=y 53CONFIG_NET_KEY=y
54CONFIG_XDP_SOCKETS=y 54CONFIG_XDP_SOCKETS=y
55CONFIG_XDP_SOCKETS_DIAG=m
55CONFIG_INET=y 56CONFIG_INET=y
56CONFIG_IP_PNP=y 57CONFIG_IP_PNP=y
57CONFIG_IP_PNP_DHCP=y 58CONFIG_IP_PNP_DHCP=y
@@ -206,9 +207,6 @@ CONFIG_NFT_FIB_IPV4=m
206CONFIG_NF_TABLES_ARP=y 207CONFIG_NF_TABLES_ARP=y
207CONFIG_NF_FLOW_TABLE_IPV4=m 208CONFIG_NF_FLOW_TABLE_IPV4=m
208CONFIG_NF_LOG_ARP=m 209CONFIG_NF_LOG_ARP=m
209CONFIG_NFT_CHAIN_NAT_IPV4=m
210CONFIG_NFT_MASQ_IPV4=m
211CONFIG_NFT_REDIR_IPV4=m
212CONFIG_IP_NF_IPTABLES=m 210CONFIG_IP_NF_IPTABLES=m
213CONFIG_IP_NF_MATCH_AH=m 211CONFIG_IP_NF_MATCH_AH=m
214CONFIG_IP_NF_MATCH_ECN=m 212CONFIG_IP_NF_MATCH_ECN=m
@@ -230,9 +228,6 @@ CONFIG_IP_NF_ARPTABLES=m
230CONFIG_IP_NF_ARPFILTER=m 228CONFIG_IP_NF_ARPFILTER=m
231CONFIG_IP_NF_ARP_MANGLE=m 229CONFIG_IP_NF_ARP_MANGLE=m
232CONFIG_NFT_CHAIN_ROUTE_IPV6=m 230CONFIG_NFT_CHAIN_ROUTE_IPV6=m
233CONFIG_NFT_CHAIN_NAT_IPV6=m
234CONFIG_NFT_MASQ_IPV6=m
235CONFIG_NFT_REDIR_IPV6=m
236CONFIG_NFT_DUP_IPV6=m 231CONFIG_NFT_DUP_IPV6=m
237CONFIG_NFT_FIB_IPV6=m 232CONFIG_NFT_FIB_IPV6=m
238CONFIG_NF_FLOW_TABLE_IPV6=m 233CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -309,7 +304,6 @@ CONFIG_AF_KCM=m
309# CONFIG_WIRELESS is not set 304# CONFIG_WIRELESS is not set
310CONFIG_PSAMPLE=m 305CONFIG_PSAMPLE=m
311CONFIG_NET_IFE=m 306CONFIG_NET_IFE=m
312CONFIG_NET_DEVLINK=m
313# CONFIG_UEVENT_HELPER is not set 307# CONFIG_UEVENT_HELPER is not set
314CONFIG_DEVTMPFS=y 308CONFIG_DEVTMPFS=y
315CONFIG_DEVTMPFS_MOUNT=y 309CONFIG_DEVTMPFS_MOUNT=y
@@ -420,12 +414,12 @@ CONFIG_RTC_DRV_GENERIC=m
420# CONFIG_VIRTIO_MENU is not set 414# CONFIG_VIRTIO_MENU is not set
421# CONFIG_IOMMU_SUPPORT is not set 415# CONFIG_IOMMU_SUPPORT is not set
422CONFIG_DAX=m 416CONFIG_DAX=m
417# CONFIG_VALIDATE_FS_PARSER is not set
423CONFIG_EXT4_FS=y 418CONFIG_EXT4_FS=y
424CONFIG_REISERFS_FS=m 419CONFIG_REISERFS_FS=m
425CONFIG_JFS_FS=m 420CONFIG_JFS_FS=m
426CONFIG_OCFS2_FS=m 421CONFIG_OCFS2_FS=m
427# CONFIG_OCFS2_DEBUG_MASKLOG is not set 422# CONFIG_OCFS2_DEBUG_MASKLOG is not set
428CONFIG_FS_ENCRYPTION=m
429CONFIG_FANOTIFY=y 423CONFIG_FANOTIFY=y
430CONFIG_QUOTA_NETLINK_INTERFACE=y 424CONFIG_QUOTA_NETLINK_INTERFACE=y
431# CONFIG_PRINT_QUOTA_WARNING is not set 425# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -533,9 +527,11 @@ CONFIG_CRYPTO_AEGIS256=m
533CONFIG_CRYPTO_MORUS640=m 527CONFIG_CRYPTO_MORUS640=m
534CONFIG_CRYPTO_MORUS1280=m 528CONFIG_CRYPTO_MORUS1280=m
535CONFIG_CRYPTO_CFB=m 529CONFIG_CRYPTO_CFB=m
530CONFIG_CRYPTO_CTS=m
536CONFIG_CRYPTO_LRW=m 531CONFIG_CRYPTO_LRW=m
537CONFIG_CRYPTO_OFB=m 532CONFIG_CRYPTO_OFB=m
538CONFIG_CRYPTO_PCBC=m 533CONFIG_CRYPTO_PCBC=m
534CONFIG_CRYPTO_XTS=m
539CONFIG_CRYPTO_KEYWRAP=m 535CONFIG_CRYPTO_KEYWRAP=m
540CONFIG_CRYPTO_ADIANTUM=m 536CONFIG_CRYPTO_ADIANTUM=m
541CONFIG_CRYPTO_XCBC=m 537CONFIG_CRYPTO_XCBC=m
@@ -600,6 +596,7 @@ CONFIG_TEST_OVERFLOW=m
600CONFIG_TEST_RHASHTABLE=m 596CONFIG_TEST_RHASHTABLE=m
601CONFIG_TEST_HASH=m 597CONFIG_TEST_HASH=m
602CONFIG_TEST_IDA=m 598CONFIG_TEST_IDA=m
599CONFIG_TEST_VMALLOC=m
603CONFIG_TEST_USER_COPY=m 600CONFIG_TEST_USER_COPY=m
604CONFIG_TEST_BPF=m 601CONFIG_TEST_BPF=m
605CONFIG_FIND_BIT_BENCHMARK=m 602CONFIG_FIND_BIT_BENCHMARK=m
@@ -609,4 +606,5 @@ CONFIG_TEST_UDELAY=m
609CONFIG_TEST_STATIC_KEYS=m 606CONFIG_TEST_STATIC_KEYS=m
610CONFIG_TEST_KMOD=m 607CONFIG_TEST_KMOD=m
611CONFIG_TEST_MEMCAT_P=m 608CONFIG_TEST_MEMCAT_P=m
609CONFIG_TEST_STACKINIT=m
612CONFIG_EARLY_PRINTK=y 610CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 1451168eb789..0fc7d2992fe0 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -59,6 +59,7 @@ CONFIG_TLS=m
59CONFIG_XFRM_MIGRATE=y 59CONFIG_XFRM_MIGRATE=y
60CONFIG_NET_KEY=y 60CONFIG_NET_KEY=y
61CONFIG_XDP_SOCKETS=y 61CONFIG_XDP_SOCKETS=y
62CONFIG_XDP_SOCKETS_DIAG=m
62CONFIG_INET=y 63CONFIG_INET=y
63CONFIG_IP_PNP=y 64CONFIG_IP_PNP=y
64CONFIG_IP_PNP_DHCP=y 65CONFIG_IP_PNP_DHCP=y
@@ -213,9 +214,6 @@ CONFIG_NFT_FIB_IPV4=m
213CONFIG_NF_TABLES_ARP=y 214CONFIG_NF_TABLES_ARP=y
214CONFIG_NF_FLOW_TABLE_IPV4=m 215CONFIG_NF_FLOW_TABLE_IPV4=m
215CONFIG_NF_LOG_ARP=m 216CONFIG_NF_LOG_ARP=m
216CONFIG_NFT_CHAIN_NAT_IPV4=m
217CONFIG_NFT_MASQ_IPV4=m
218CONFIG_NFT_REDIR_IPV4=m
219CONFIG_IP_NF_IPTABLES=m 217CONFIG_IP_NF_IPTABLES=m
220CONFIG_IP_NF_MATCH_AH=m 218CONFIG_IP_NF_MATCH_AH=m
221CONFIG_IP_NF_MATCH_ECN=m 219CONFIG_IP_NF_MATCH_ECN=m
@@ -237,9 +235,6 @@ CONFIG_IP_NF_ARPTABLES=m
237CONFIG_IP_NF_ARPFILTER=m 235CONFIG_IP_NF_ARPFILTER=m
238CONFIG_IP_NF_ARP_MANGLE=m 236CONFIG_IP_NF_ARP_MANGLE=m
239CONFIG_NFT_CHAIN_ROUTE_IPV6=m 237CONFIG_NFT_CHAIN_ROUTE_IPV6=m
240CONFIG_NFT_CHAIN_NAT_IPV6=m
241CONFIG_NFT_MASQ_IPV6=m
242CONFIG_NFT_REDIR_IPV6=m
243CONFIG_NFT_DUP_IPV6=m 238CONFIG_NFT_DUP_IPV6=m
244CONFIG_NFT_FIB_IPV6=m 239CONFIG_NFT_FIB_IPV6=m
245CONFIG_NF_FLOW_TABLE_IPV6=m 240CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -316,7 +311,6 @@ CONFIG_AF_KCM=m
316# CONFIG_WIRELESS is not set 311# CONFIG_WIRELESS is not set
317CONFIG_PSAMPLE=m 312CONFIG_PSAMPLE=m
318CONFIG_NET_IFE=m 313CONFIG_NET_IFE=m
319CONFIG_NET_DEVLINK=m
320# CONFIG_UEVENT_HELPER is not set 314# CONFIG_UEVENT_HELPER is not set
321CONFIG_DEVTMPFS=y 315CONFIG_DEVTMPFS=y
322CONFIG_DEVTMPFS_MOUNT=y 316CONFIG_DEVTMPFS_MOUNT=y
@@ -442,12 +436,12 @@ CONFIG_RTC_DRV_GENERIC=m
442# CONFIG_VIRTIO_MENU is not set 436# CONFIG_VIRTIO_MENU is not set
443# CONFIG_IOMMU_SUPPORT is not set 437# CONFIG_IOMMU_SUPPORT is not set
444CONFIG_DAX=m 438CONFIG_DAX=m
439# CONFIG_VALIDATE_FS_PARSER is not set
445CONFIG_EXT4_FS=y 440CONFIG_EXT4_FS=y
446CONFIG_REISERFS_FS=m 441CONFIG_REISERFS_FS=m
447CONFIG_JFS_FS=m 442CONFIG_JFS_FS=m
448CONFIG_OCFS2_FS=m 443CONFIG_OCFS2_FS=m
449# CONFIG_OCFS2_DEBUG_MASKLOG is not set 444# CONFIG_OCFS2_DEBUG_MASKLOG is not set
450CONFIG_FS_ENCRYPTION=m
451CONFIG_FANOTIFY=y 445CONFIG_FANOTIFY=y
452CONFIG_QUOTA_NETLINK_INTERFACE=y 446CONFIG_QUOTA_NETLINK_INTERFACE=y
453# CONFIG_PRINT_QUOTA_WARNING is not set 447# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -555,9 +549,11 @@ CONFIG_CRYPTO_AEGIS256=m
555CONFIG_CRYPTO_MORUS640=m 549CONFIG_CRYPTO_MORUS640=m
556CONFIG_CRYPTO_MORUS1280=m 550CONFIG_CRYPTO_MORUS1280=m
557CONFIG_CRYPTO_CFB=m 551CONFIG_CRYPTO_CFB=m
552CONFIG_CRYPTO_CTS=m
558CONFIG_CRYPTO_LRW=m 553CONFIG_CRYPTO_LRW=m
559CONFIG_CRYPTO_OFB=m 554CONFIG_CRYPTO_OFB=m
560CONFIG_CRYPTO_PCBC=m 555CONFIG_CRYPTO_PCBC=m
556CONFIG_CRYPTO_XTS=m
561CONFIG_CRYPTO_KEYWRAP=m 557CONFIG_CRYPTO_KEYWRAP=m
562CONFIG_CRYPTO_ADIANTUM=m 558CONFIG_CRYPTO_ADIANTUM=m
563CONFIG_CRYPTO_XCBC=m 559CONFIG_CRYPTO_XCBC=m
@@ -622,6 +618,7 @@ CONFIG_TEST_OVERFLOW=m
622CONFIG_TEST_RHASHTABLE=m 618CONFIG_TEST_RHASHTABLE=m
623CONFIG_TEST_HASH=m 619CONFIG_TEST_HASH=m
624CONFIG_TEST_IDA=m 620CONFIG_TEST_IDA=m
621CONFIG_TEST_VMALLOC=m
625CONFIG_TEST_USER_COPY=m 622CONFIG_TEST_USER_COPY=m
626CONFIG_TEST_BPF=m 623CONFIG_TEST_BPF=m
627CONFIG_FIND_BIT_BENCHMARK=m 624CONFIG_FIND_BIT_BENCHMARK=m
@@ -631,4 +628,5 @@ CONFIG_TEST_UDELAY=m
631CONFIG_TEST_STATIC_KEYS=m 628CONFIG_TEST_STATIC_KEYS=m
632CONFIG_TEST_KMOD=m 629CONFIG_TEST_KMOD=m
633CONFIG_TEST_MEMCAT_P=m 630CONFIG_TEST_MEMCAT_P=m
631CONFIG_TEST_STACKINIT=m
634CONFIG_EARLY_PRINTK=y 632CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index b0d3609f5bb3..699df9fdf866 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -49,6 +49,7 @@ CONFIG_TLS=m
49CONFIG_XFRM_MIGRATE=y 49CONFIG_XFRM_MIGRATE=y
50CONFIG_NET_KEY=y 50CONFIG_NET_KEY=y
51CONFIG_XDP_SOCKETS=y 51CONFIG_XDP_SOCKETS=y
52CONFIG_XDP_SOCKETS_DIAG=m
52CONFIG_INET=y 53CONFIG_INET=y
53CONFIG_IP_PNP=y 54CONFIG_IP_PNP=y
54CONFIG_IP_PNP_DHCP=y 55CONFIG_IP_PNP_DHCP=y
@@ -203,9 +204,6 @@ CONFIG_NFT_FIB_IPV4=m
203CONFIG_NF_TABLES_ARP=y 204CONFIG_NF_TABLES_ARP=y
204CONFIG_NF_FLOW_TABLE_IPV4=m 205CONFIG_NF_FLOW_TABLE_IPV4=m
205CONFIG_NF_LOG_ARP=m 206CONFIG_NF_LOG_ARP=m
206CONFIG_NFT_CHAIN_NAT_IPV4=m
207CONFIG_NFT_MASQ_IPV4=m
208CONFIG_NFT_REDIR_IPV4=m
209CONFIG_IP_NF_IPTABLES=m 207CONFIG_IP_NF_IPTABLES=m
210CONFIG_IP_NF_MATCH_AH=m 208CONFIG_IP_NF_MATCH_AH=m
211CONFIG_IP_NF_MATCH_ECN=m 209CONFIG_IP_NF_MATCH_ECN=m
@@ -227,9 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m
227CONFIG_IP_NF_ARPFILTER=m 225CONFIG_IP_NF_ARPFILTER=m
228CONFIG_IP_NF_ARP_MANGLE=m 226CONFIG_IP_NF_ARP_MANGLE=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 227CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_CHAIN_NAT_IPV6=m
231CONFIG_NFT_MASQ_IPV6=m
232CONFIG_NFT_REDIR_IPV6=m
233CONFIG_NFT_DUP_IPV6=m 228CONFIG_NFT_DUP_IPV6=m
234CONFIG_NFT_FIB_IPV6=m 229CONFIG_NFT_FIB_IPV6=m
235CONFIG_NF_FLOW_TABLE_IPV6=m 230CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -306,7 +301,6 @@ CONFIG_AF_KCM=m
306# CONFIG_WIRELESS is not set 301# CONFIG_WIRELESS is not set
307CONFIG_PSAMPLE=m 302CONFIG_PSAMPLE=m
308CONFIG_NET_IFE=m 303CONFIG_NET_IFE=m
309CONFIG_NET_DEVLINK=m
310# CONFIG_UEVENT_HELPER is not set 304# CONFIG_UEVENT_HELPER is not set
311CONFIG_DEVTMPFS=y 305CONFIG_DEVTMPFS=y
312CONFIG_DEVTMPFS_MOUNT=y 306CONFIG_DEVTMPFS_MOUNT=y
@@ -413,12 +407,12 @@ CONFIG_RTC_DRV_GENERIC=m
413# CONFIG_VIRTIO_MENU is not set 407# CONFIG_VIRTIO_MENU is not set
414# CONFIG_IOMMU_SUPPORT is not set 408# CONFIG_IOMMU_SUPPORT is not set
415CONFIG_DAX=m 409CONFIG_DAX=m
410# CONFIG_VALIDATE_FS_PARSER is not set
416CONFIG_EXT4_FS=y 411CONFIG_EXT4_FS=y
417CONFIG_REISERFS_FS=m 412CONFIG_REISERFS_FS=m
418CONFIG_JFS_FS=m 413CONFIG_JFS_FS=m
419CONFIG_OCFS2_FS=m 414CONFIG_OCFS2_FS=m
420# CONFIG_OCFS2_DEBUG_MASKLOG is not set 415# CONFIG_OCFS2_DEBUG_MASKLOG is not set
421CONFIG_FS_ENCRYPTION=m
422CONFIG_FANOTIFY=y 416CONFIG_FANOTIFY=y
423CONFIG_QUOTA_NETLINK_INTERFACE=y 417CONFIG_QUOTA_NETLINK_INTERFACE=y
424# CONFIG_PRINT_QUOTA_WARNING is not set 418# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -526,9 +520,11 @@ CONFIG_CRYPTO_AEGIS256=m
526CONFIG_CRYPTO_MORUS640=m 520CONFIG_CRYPTO_MORUS640=m
527CONFIG_CRYPTO_MORUS1280=m 521CONFIG_CRYPTO_MORUS1280=m
528CONFIG_CRYPTO_CFB=m 522CONFIG_CRYPTO_CFB=m
523CONFIG_CRYPTO_CTS=m
529CONFIG_CRYPTO_LRW=m 524CONFIG_CRYPTO_LRW=m
530CONFIG_CRYPTO_OFB=m 525CONFIG_CRYPTO_OFB=m
531CONFIG_CRYPTO_PCBC=m 526CONFIG_CRYPTO_PCBC=m
527CONFIG_CRYPTO_XTS=m
532CONFIG_CRYPTO_KEYWRAP=m 528CONFIG_CRYPTO_KEYWRAP=m
533CONFIG_CRYPTO_ADIANTUM=m 529CONFIG_CRYPTO_ADIANTUM=m
534CONFIG_CRYPTO_XCBC=m 530CONFIG_CRYPTO_XCBC=m
@@ -593,6 +589,7 @@ CONFIG_TEST_OVERFLOW=m
593CONFIG_TEST_RHASHTABLE=m 589CONFIG_TEST_RHASHTABLE=m
594CONFIG_TEST_HASH=m 590CONFIG_TEST_HASH=m
595CONFIG_TEST_IDA=m 591CONFIG_TEST_IDA=m
592CONFIG_TEST_VMALLOC=m
596CONFIG_TEST_USER_COPY=m 593CONFIG_TEST_USER_COPY=m
597CONFIG_TEST_BPF=m 594CONFIG_TEST_BPF=m
598CONFIG_FIND_BIT_BENCHMARK=m 595CONFIG_FIND_BIT_BENCHMARK=m
@@ -602,4 +599,5 @@ CONFIG_TEST_UDELAY=m
602CONFIG_TEST_STATIC_KEYS=m 599CONFIG_TEST_STATIC_KEYS=m
603CONFIG_TEST_KMOD=m 600CONFIG_TEST_KMOD=m
604CONFIG_TEST_MEMCAT_P=m 601CONFIG_TEST_MEMCAT_P=m
602CONFIG_TEST_STACKINIT=m
605CONFIG_EARLY_PRINTK=y 603CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 4ed7c151347c..b50802255324 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -51,6 +51,7 @@ CONFIG_TLS=m
51CONFIG_XFRM_MIGRATE=y 51CONFIG_XFRM_MIGRATE=y
52CONFIG_NET_KEY=y 52CONFIG_NET_KEY=y
53CONFIG_XDP_SOCKETS=y 53CONFIG_XDP_SOCKETS=y
54CONFIG_XDP_SOCKETS_DIAG=m
54CONFIG_INET=y 55CONFIG_INET=y
55CONFIG_IP_PNP=y 56CONFIG_IP_PNP=y
56CONFIG_IP_PNP_DHCP=y 57CONFIG_IP_PNP_DHCP=y
@@ -205,9 +206,6 @@ CONFIG_NFT_FIB_IPV4=m
205CONFIG_NF_TABLES_ARP=y 206CONFIG_NF_TABLES_ARP=y
206CONFIG_NF_FLOW_TABLE_IPV4=m 207CONFIG_NF_FLOW_TABLE_IPV4=m
207CONFIG_NF_LOG_ARP=m 208CONFIG_NF_LOG_ARP=m
208CONFIG_NFT_CHAIN_NAT_IPV4=m
209CONFIG_NFT_MASQ_IPV4=m
210CONFIG_NFT_REDIR_IPV4=m
211CONFIG_IP_NF_IPTABLES=m 209CONFIG_IP_NF_IPTABLES=m
212CONFIG_IP_NF_MATCH_AH=m 210CONFIG_IP_NF_MATCH_AH=m
213CONFIG_IP_NF_MATCH_ECN=m 211CONFIG_IP_NF_MATCH_ECN=m
@@ -229,9 +227,6 @@ CONFIG_IP_NF_ARPTABLES=m
229CONFIG_IP_NF_ARPFILTER=m 227CONFIG_IP_NF_ARPFILTER=m
230CONFIG_IP_NF_ARP_MANGLE=m 228CONFIG_IP_NF_ARP_MANGLE=m
231CONFIG_NFT_CHAIN_ROUTE_IPV6=m 229CONFIG_NFT_CHAIN_ROUTE_IPV6=m
232CONFIG_NFT_CHAIN_NAT_IPV6=m
233CONFIG_NFT_MASQ_IPV6=m
234CONFIG_NFT_REDIR_IPV6=m
235CONFIG_NFT_DUP_IPV6=m 230CONFIG_NFT_DUP_IPV6=m
236CONFIG_NFT_FIB_IPV6=m 231CONFIG_NFT_FIB_IPV6=m
237CONFIG_NF_FLOW_TABLE_IPV6=m 232CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -308,7 +303,6 @@ CONFIG_AF_KCM=m
308# CONFIG_WIRELESS is not set 303# CONFIG_WIRELESS is not set
309CONFIG_PSAMPLE=m 304CONFIG_PSAMPLE=m
310CONFIG_NET_IFE=m 305CONFIG_NET_IFE=m
311CONFIG_NET_DEVLINK=m
312# CONFIG_UEVENT_HELPER is not set 306# CONFIG_UEVENT_HELPER is not set
313CONFIG_DEVTMPFS=y 307CONFIG_DEVTMPFS=y
314CONFIG_DEVTMPFS_MOUNT=y 308CONFIG_DEVTMPFS_MOUNT=y
@@ -422,12 +416,12 @@ CONFIG_RTC_DRV_GENERIC=m
422# CONFIG_VIRTIO_MENU is not set 416# CONFIG_VIRTIO_MENU is not set
423# CONFIG_IOMMU_SUPPORT is not set 417# CONFIG_IOMMU_SUPPORT is not set
424CONFIG_DAX=m 418CONFIG_DAX=m
419# CONFIG_VALIDATE_FS_PARSER is not set
425CONFIG_EXT4_FS=y 420CONFIG_EXT4_FS=y
426CONFIG_REISERFS_FS=m 421CONFIG_REISERFS_FS=m
427CONFIG_JFS_FS=m 422CONFIG_JFS_FS=m
428CONFIG_OCFS2_FS=m 423CONFIG_OCFS2_FS=m
429# CONFIG_OCFS2_DEBUG_MASKLOG is not set 424# CONFIG_OCFS2_DEBUG_MASKLOG is not set
430CONFIG_FS_ENCRYPTION=m
431CONFIG_FANOTIFY=y 425CONFIG_FANOTIFY=y
432CONFIG_QUOTA_NETLINK_INTERFACE=y 426CONFIG_QUOTA_NETLINK_INTERFACE=y
433# CONFIG_PRINT_QUOTA_WARNING is not set 427# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -535,9 +529,11 @@ CONFIG_CRYPTO_AEGIS256=m
535CONFIG_CRYPTO_MORUS640=m 529CONFIG_CRYPTO_MORUS640=m
536CONFIG_CRYPTO_MORUS1280=m 530CONFIG_CRYPTO_MORUS1280=m
537CONFIG_CRYPTO_CFB=m 531CONFIG_CRYPTO_CFB=m
532CONFIG_CRYPTO_CTS=m
538CONFIG_CRYPTO_LRW=m 533CONFIG_CRYPTO_LRW=m
539CONFIG_CRYPTO_OFB=m 534CONFIG_CRYPTO_OFB=m
540CONFIG_CRYPTO_PCBC=m 535CONFIG_CRYPTO_PCBC=m
536CONFIG_CRYPTO_XTS=m
541CONFIG_CRYPTO_KEYWRAP=m 537CONFIG_CRYPTO_KEYWRAP=m
542CONFIG_CRYPTO_ADIANTUM=m 538CONFIG_CRYPTO_ADIANTUM=m
543CONFIG_CRYPTO_XCBC=m 539CONFIG_CRYPTO_XCBC=m
@@ -602,6 +598,7 @@ CONFIG_TEST_OVERFLOW=m
602CONFIG_TEST_RHASHTABLE=m 598CONFIG_TEST_RHASHTABLE=m
603CONFIG_TEST_HASH=m 599CONFIG_TEST_HASH=m
604CONFIG_TEST_IDA=m 600CONFIG_TEST_IDA=m
601CONFIG_TEST_VMALLOC=m
605CONFIG_TEST_USER_COPY=m 602CONFIG_TEST_USER_COPY=m
606CONFIG_TEST_BPF=m 603CONFIG_TEST_BPF=m
607CONFIG_FIND_BIT_BENCHMARK=m 604CONFIG_FIND_BIT_BENCHMARK=m
@@ -611,4 +608,5 @@ CONFIG_TEST_UDELAY=m
611CONFIG_TEST_STATIC_KEYS=m 608CONFIG_TEST_STATIC_KEYS=m
612CONFIG_TEST_KMOD=m 609CONFIG_TEST_KMOD=m
613CONFIG_TEST_MEMCAT_P=m 610CONFIG_TEST_MEMCAT_P=m
611CONFIG_TEST_STACKINIT=m
614CONFIG_EARLY_PRINTK=y 612CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 0dc544e1ce1f..04e7d70f6030 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -50,6 +50,7 @@ CONFIG_TLS=m
50CONFIG_XFRM_MIGRATE=y 50CONFIG_XFRM_MIGRATE=y
51CONFIG_NET_KEY=y 51CONFIG_NET_KEY=y
52CONFIG_XDP_SOCKETS=y 52CONFIG_XDP_SOCKETS=y
53CONFIG_XDP_SOCKETS_DIAG=m
53CONFIG_INET=y 54CONFIG_INET=y
54CONFIG_IP_PNP=y 55CONFIG_IP_PNP=y
55CONFIG_IP_PNP_DHCP=y 56CONFIG_IP_PNP_DHCP=y
@@ -204,9 +205,6 @@ CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=y 205CONFIG_NF_TABLES_ARP=y
205CONFIG_NF_FLOW_TABLE_IPV4=m 206CONFIG_NF_FLOW_TABLE_IPV4=m
206CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
207CONFIG_NFT_CHAIN_NAT_IPV4=m
208CONFIG_NFT_MASQ_IPV4=m
209CONFIG_NFT_REDIR_IPV4=m
210CONFIG_IP_NF_IPTABLES=m 208CONFIG_IP_NF_IPTABLES=m
211CONFIG_IP_NF_MATCH_AH=m 209CONFIG_IP_NF_MATCH_AH=m
212CONFIG_IP_NF_MATCH_ECN=m 210CONFIG_IP_NF_MATCH_ECN=m
@@ -228,9 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m
228CONFIG_IP_NF_ARPFILTER=m 226CONFIG_IP_NF_ARPFILTER=m
229CONFIG_IP_NF_ARP_MANGLE=m 227CONFIG_IP_NF_ARP_MANGLE=m
230CONFIG_NFT_CHAIN_ROUTE_IPV6=m 228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
231CONFIG_NFT_CHAIN_NAT_IPV6=m
232CONFIG_NFT_MASQ_IPV6=m
233CONFIG_NFT_REDIR_IPV6=m
234CONFIG_NFT_DUP_IPV6=m 229CONFIG_NFT_DUP_IPV6=m
235CONFIG_NFT_FIB_IPV6=m 230CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m 231CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -310,7 +305,6 @@ CONFIG_AF_KCM=m
310# CONFIG_WIRELESS is not set 305# CONFIG_WIRELESS is not set
311CONFIG_PSAMPLE=m 306CONFIG_PSAMPLE=m
312CONFIG_NET_IFE=m 307CONFIG_NET_IFE=m
313CONFIG_NET_DEVLINK=m
314# CONFIG_UEVENT_HELPER is not set 308# CONFIG_UEVENT_HELPER is not set
315CONFIG_DEVTMPFS=y 309CONFIG_DEVTMPFS=y
316CONFIG_DEVTMPFS_MOUNT=y 310CONFIG_DEVTMPFS_MOUNT=y
@@ -444,12 +438,12 @@ CONFIG_RTC_DRV_GENERIC=m
444# CONFIG_VIRTIO_MENU is not set 438# CONFIG_VIRTIO_MENU is not set
445# CONFIG_IOMMU_SUPPORT is not set 439# CONFIG_IOMMU_SUPPORT is not set
446CONFIG_DAX=m 440CONFIG_DAX=m
441# CONFIG_VALIDATE_FS_PARSER is not set
447CONFIG_EXT4_FS=y 442CONFIG_EXT4_FS=y
448CONFIG_REISERFS_FS=m 443CONFIG_REISERFS_FS=m
449CONFIG_JFS_FS=m 444CONFIG_JFS_FS=m
450CONFIG_OCFS2_FS=m 445CONFIG_OCFS2_FS=m
451# CONFIG_OCFS2_DEBUG_MASKLOG is not set 446# CONFIG_OCFS2_DEBUG_MASKLOG is not set
452CONFIG_FS_ENCRYPTION=m
453CONFIG_FANOTIFY=y 447CONFIG_FANOTIFY=y
454CONFIG_QUOTA_NETLINK_INTERFACE=y 448CONFIG_QUOTA_NETLINK_INTERFACE=y
455# CONFIG_PRINT_QUOTA_WARNING is not set 449# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -557,9 +551,11 @@ CONFIG_CRYPTO_AEGIS256=m
557CONFIG_CRYPTO_MORUS640=m 551CONFIG_CRYPTO_MORUS640=m
558CONFIG_CRYPTO_MORUS1280=m 552CONFIG_CRYPTO_MORUS1280=m
559CONFIG_CRYPTO_CFB=m 553CONFIG_CRYPTO_CFB=m
554CONFIG_CRYPTO_CTS=m
560CONFIG_CRYPTO_LRW=m 555CONFIG_CRYPTO_LRW=m
561CONFIG_CRYPTO_OFB=m 556CONFIG_CRYPTO_OFB=m
562CONFIG_CRYPTO_PCBC=m 557CONFIG_CRYPTO_PCBC=m
558CONFIG_CRYPTO_XTS=m
563CONFIG_CRYPTO_KEYWRAP=m 559CONFIG_CRYPTO_KEYWRAP=m
564CONFIG_CRYPTO_ADIANTUM=m 560CONFIG_CRYPTO_ADIANTUM=m
565CONFIG_CRYPTO_XCBC=m 561CONFIG_CRYPTO_XCBC=m
@@ -624,6 +620,7 @@ CONFIG_TEST_OVERFLOW=m
624CONFIG_TEST_RHASHTABLE=m 620CONFIG_TEST_RHASHTABLE=m
625CONFIG_TEST_HASH=m 621CONFIG_TEST_HASH=m
626CONFIG_TEST_IDA=m 622CONFIG_TEST_IDA=m
623CONFIG_TEST_VMALLOC=m
627CONFIG_TEST_USER_COPY=m 624CONFIG_TEST_USER_COPY=m
628CONFIG_TEST_BPF=m 625CONFIG_TEST_BPF=m
629CONFIG_FIND_BIT_BENCHMARK=m 626CONFIG_FIND_BIT_BENCHMARK=m
@@ -633,4 +630,5 @@ CONFIG_TEST_UDELAY=m
633CONFIG_TEST_STATIC_KEYS=m 630CONFIG_TEST_STATIC_KEYS=m
634CONFIG_TEST_KMOD=m 631CONFIG_TEST_KMOD=m
635CONFIG_TEST_MEMCAT_P=m 632CONFIG_TEST_MEMCAT_P=m
633CONFIG_TEST_STACKINIT=m
636CONFIG_EARLY_PRINTK=y 634CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 5a7b7b0d6e72..5e1cc4c17852 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -70,6 +70,7 @@ CONFIG_TLS=m
70CONFIG_XFRM_MIGRATE=y 70CONFIG_XFRM_MIGRATE=y
71CONFIG_NET_KEY=y 71CONFIG_NET_KEY=y
72CONFIG_XDP_SOCKETS=y 72CONFIG_XDP_SOCKETS=y
73CONFIG_XDP_SOCKETS_DIAG=m
73CONFIG_INET=y 74CONFIG_INET=y
74CONFIG_IP_PNP=y 75CONFIG_IP_PNP=y
75CONFIG_IP_PNP_DHCP=y 76CONFIG_IP_PNP_DHCP=y
@@ -224,9 +225,6 @@ CONFIG_NFT_FIB_IPV4=m
224CONFIG_NF_TABLES_ARP=y 225CONFIG_NF_TABLES_ARP=y
225CONFIG_NF_FLOW_TABLE_IPV4=m 226CONFIG_NF_FLOW_TABLE_IPV4=m
226CONFIG_NF_LOG_ARP=m 227CONFIG_NF_LOG_ARP=m
227CONFIG_NFT_CHAIN_NAT_IPV4=m
228CONFIG_NFT_MASQ_IPV4=m
229CONFIG_NFT_REDIR_IPV4=m
230CONFIG_IP_NF_IPTABLES=m 228CONFIG_IP_NF_IPTABLES=m
231CONFIG_IP_NF_MATCH_AH=m 229CONFIG_IP_NF_MATCH_AH=m
232CONFIG_IP_NF_MATCH_ECN=m 230CONFIG_IP_NF_MATCH_ECN=m
@@ -248,9 +246,6 @@ CONFIG_IP_NF_ARPTABLES=m
248CONFIG_IP_NF_ARPFILTER=m 246CONFIG_IP_NF_ARPFILTER=m
249CONFIG_IP_NF_ARP_MANGLE=m 247CONFIG_IP_NF_ARP_MANGLE=m
250CONFIG_NFT_CHAIN_ROUTE_IPV6=m 248CONFIG_NFT_CHAIN_ROUTE_IPV6=m
251CONFIG_NFT_CHAIN_NAT_IPV6=m
252CONFIG_NFT_MASQ_IPV6=m
253CONFIG_NFT_REDIR_IPV6=m
254CONFIG_NFT_DUP_IPV6=m 249CONFIG_NFT_DUP_IPV6=m
255CONFIG_NFT_FIB_IPV6=m 250CONFIG_NFT_FIB_IPV6=m
256CONFIG_NF_FLOW_TABLE_IPV6=m 251CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -330,7 +325,6 @@ CONFIG_AF_KCM=m
330# CONFIG_WIRELESS is not set 325# CONFIG_WIRELESS is not set
331CONFIG_PSAMPLE=m 326CONFIG_PSAMPLE=m
332CONFIG_NET_IFE=m 327CONFIG_NET_IFE=m
333CONFIG_NET_DEVLINK=m
334# CONFIG_UEVENT_HELPER is not set 328# CONFIG_UEVENT_HELPER is not set
335CONFIG_DEVTMPFS=y 329CONFIG_DEVTMPFS=y
336CONFIG_DEVTMPFS_MOUNT=y 330CONFIG_DEVTMPFS_MOUNT=y
@@ -526,12 +520,12 @@ CONFIG_RTC_DRV_GENERIC=m
526# CONFIG_VIRTIO_MENU is not set 520# CONFIG_VIRTIO_MENU is not set
527# CONFIG_IOMMU_SUPPORT is not set 521# CONFIG_IOMMU_SUPPORT is not set
528CONFIG_DAX=m 522CONFIG_DAX=m
523# CONFIG_VALIDATE_FS_PARSER is not set
529CONFIG_EXT4_FS=y 524CONFIG_EXT4_FS=y
530CONFIG_REISERFS_FS=m 525CONFIG_REISERFS_FS=m
531CONFIG_JFS_FS=m 526CONFIG_JFS_FS=m
532CONFIG_OCFS2_FS=m 527CONFIG_OCFS2_FS=m
533# CONFIG_OCFS2_DEBUG_MASKLOG is not set 528# CONFIG_OCFS2_DEBUG_MASKLOG is not set
534CONFIG_FS_ENCRYPTION=m
535CONFIG_FANOTIFY=y 529CONFIG_FANOTIFY=y
536CONFIG_QUOTA_NETLINK_INTERFACE=y 530CONFIG_QUOTA_NETLINK_INTERFACE=y
537# CONFIG_PRINT_QUOTA_WARNING is not set 531# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -639,9 +633,11 @@ CONFIG_CRYPTO_AEGIS256=m
639CONFIG_CRYPTO_MORUS640=m 633CONFIG_CRYPTO_MORUS640=m
640CONFIG_CRYPTO_MORUS1280=m 634CONFIG_CRYPTO_MORUS1280=m
641CONFIG_CRYPTO_CFB=m 635CONFIG_CRYPTO_CFB=m
636CONFIG_CRYPTO_CTS=m
642CONFIG_CRYPTO_LRW=m 637CONFIG_CRYPTO_LRW=m
643CONFIG_CRYPTO_OFB=m 638CONFIG_CRYPTO_OFB=m
644CONFIG_CRYPTO_PCBC=m 639CONFIG_CRYPTO_PCBC=m
640CONFIG_CRYPTO_XTS=m
645CONFIG_CRYPTO_KEYWRAP=m 641CONFIG_CRYPTO_KEYWRAP=m
646CONFIG_CRYPTO_ADIANTUM=m 642CONFIG_CRYPTO_ADIANTUM=m
647CONFIG_CRYPTO_XCBC=m 643CONFIG_CRYPTO_XCBC=m
@@ -706,6 +702,7 @@ CONFIG_TEST_OVERFLOW=m
706CONFIG_TEST_RHASHTABLE=m 702CONFIG_TEST_RHASHTABLE=m
707CONFIG_TEST_HASH=m 703CONFIG_TEST_HASH=m
708CONFIG_TEST_IDA=m 704CONFIG_TEST_IDA=m
705CONFIG_TEST_VMALLOC=m
709CONFIG_TEST_USER_COPY=m 706CONFIG_TEST_USER_COPY=m
710CONFIG_TEST_BPF=m 707CONFIG_TEST_BPF=m
711CONFIG_FIND_BIT_BENCHMARK=m 708CONFIG_FIND_BIT_BENCHMARK=m
@@ -715,4 +712,5 @@ CONFIG_TEST_UDELAY=m
715CONFIG_TEST_STATIC_KEYS=m 712CONFIG_TEST_STATIC_KEYS=m
716CONFIG_TEST_KMOD=m 713CONFIG_TEST_KMOD=m
717CONFIG_TEST_MEMCAT_P=m 714CONFIG_TEST_MEMCAT_P=m
715CONFIG_TEST_STACKINIT=m
718CONFIG_EARLY_PRINTK=y 716CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 71eb9be1803b..170ac8792c2d 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -48,6 +48,7 @@ CONFIG_TLS=m
48CONFIG_XFRM_MIGRATE=y 48CONFIG_XFRM_MIGRATE=y
49CONFIG_NET_KEY=y 49CONFIG_NET_KEY=y
50CONFIG_XDP_SOCKETS=y 50CONFIG_XDP_SOCKETS=y
51CONFIG_XDP_SOCKETS_DIAG=m
51CONFIG_INET=y 52CONFIG_INET=y
52CONFIG_IP_PNP=y 53CONFIG_IP_PNP=y
53CONFIG_IP_PNP_DHCP=y 54CONFIG_IP_PNP_DHCP=y
@@ -202,9 +203,6 @@ CONFIG_NFT_FIB_IPV4=m
202CONFIG_NF_TABLES_ARP=y 203CONFIG_NF_TABLES_ARP=y
203CONFIG_NF_FLOW_TABLE_IPV4=m 204CONFIG_NF_FLOW_TABLE_IPV4=m
204CONFIG_NF_LOG_ARP=m 205CONFIG_NF_LOG_ARP=m
205CONFIG_NFT_CHAIN_NAT_IPV4=m
206CONFIG_NFT_MASQ_IPV4=m
207CONFIG_NFT_REDIR_IPV4=m
208CONFIG_IP_NF_IPTABLES=m 206CONFIG_IP_NF_IPTABLES=m
209CONFIG_IP_NF_MATCH_AH=m 207CONFIG_IP_NF_MATCH_AH=m
210CONFIG_IP_NF_MATCH_ECN=m 208CONFIG_IP_NF_MATCH_ECN=m
@@ -226,9 +224,6 @@ CONFIG_IP_NF_ARPTABLES=m
226CONFIG_IP_NF_ARPFILTER=m 224CONFIG_IP_NF_ARPFILTER=m
227CONFIG_IP_NF_ARP_MANGLE=m 225CONFIG_IP_NF_ARP_MANGLE=m
228CONFIG_NFT_CHAIN_ROUTE_IPV6=m 226CONFIG_NFT_CHAIN_ROUTE_IPV6=m
229CONFIG_NFT_CHAIN_NAT_IPV6=m
230CONFIG_NFT_MASQ_IPV6=m
231CONFIG_NFT_REDIR_IPV6=m
232CONFIG_NFT_DUP_IPV6=m 227CONFIG_NFT_DUP_IPV6=m
233CONFIG_NFT_FIB_IPV6=m 228CONFIG_NFT_FIB_IPV6=m
234CONFIG_NF_FLOW_TABLE_IPV6=m 229CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -305,7 +300,6 @@ CONFIG_AF_KCM=m
305# CONFIG_WIRELESS is not set 300# CONFIG_WIRELESS is not set
306CONFIG_PSAMPLE=m 301CONFIG_PSAMPLE=m
307CONFIG_NET_IFE=m 302CONFIG_NET_IFE=m
308CONFIG_NET_DEVLINK=m
309# CONFIG_UEVENT_HELPER is not set 303# CONFIG_UEVENT_HELPER is not set
310CONFIG_DEVTMPFS=y 304CONFIG_DEVTMPFS=y
311CONFIG_DEVTMPFS_MOUNT=y 305CONFIG_DEVTMPFS_MOUNT=y
@@ -412,12 +406,12 @@ CONFIG_RTC_DRV_GENERIC=m
412# CONFIG_VIRTIO_MENU is not set 406# CONFIG_VIRTIO_MENU is not set
413# CONFIG_IOMMU_SUPPORT is not set 407# CONFIG_IOMMU_SUPPORT is not set
414CONFIG_DAX=m 408CONFIG_DAX=m
409# CONFIG_VALIDATE_FS_PARSER is not set
415CONFIG_EXT4_FS=y 410CONFIG_EXT4_FS=y
416CONFIG_REISERFS_FS=m 411CONFIG_REISERFS_FS=m
417CONFIG_JFS_FS=m 412CONFIG_JFS_FS=m
418CONFIG_OCFS2_FS=m 413CONFIG_OCFS2_FS=m
419# CONFIG_OCFS2_DEBUG_MASKLOG is not set 414# CONFIG_OCFS2_DEBUG_MASKLOG is not set
420CONFIG_FS_ENCRYPTION=m
421CONFIG_FANOTIFY=y 415CONFIG_FANOTIFY=y
422CONFIG_QUOTA_NETLINK_INTERFACE=y 416CONFIG_QUOTA_NETLINK_INTERFACE=y
423# CONFIG_PRINT_QUOTA_WARNING is not set 417# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -525,9 +519,11 @@ CONFIG_CRYPTO_AEGIS256=m
525CONFIG_CRYPTO_MORUS640=m 519CONFIG_CRYPTO_MORUS640=m
526CONFIG_CRYPTO_MORUS1280=m 520CONFIG_CRYPTO_MORUS1280=m
527CONFIG_CRYPTO_CFB=m 521CONFIG_CRYPTO_CFB=m
522CONFIG_CRYPTO_CTS=m
528CONFIG_CRYPTO_LRW=m 523CONFIG_CRYPTO_LRW=m
529CONFIG_CRYPTO_OFB=m 524CONFIG_CRYPTO_OFB=m
530CONFIG_CRYPTO_PCBC=m 525CONFIG_CRYPTO_PCBC=m
526CONFIG_CRYPTO_XTS=m
531CONFIG_CRYPTO_KEYWRAP=m 527CONFIG_CRYPTO_KEYWRAP=m
532CONFIG_CRYPTO_ADIANTUM=m 528CONFIG_CRYPTO_ADIANTUM=m
533CONFIG_CRYPTO_XCBC=m 529CONFIG_CRYPTO_XCBC=m
@@ -592,6 +588,7 @@ CONFIG_TEST_OVERFLOW=m
592CONFIG_TEST_RHASHTABLE=m 588CONFIG_TEST_RHASHTABLE=m
593CONFIG_TEST_HASH=m 589CONFIG_TEST_HASH=m
594CONFIG_TEST_IDA=m 590CONFIG_TEST_IDA=m
591CONFIG_TEST_VMALLOC=m
595CONFIG_TEST_USER_COPY=m 592CONFIG_TEST_USER_COPY=m
596CONFIG_TEST_BPF=m 593CONFIG_TEST_BPF=m
597CONFIG_FIND_BIT_BENCHMARK=m 594CONFIG_FIND_BIT_BENCHMARK=m
@@ -601,4 +598,5 @@ CONFIG_TEST_UDELAY=m
601CONFIG_TEST_STATIC_KEYS=m 598CONFIG_TEST_STATIC_KEYS=m
602CONFIG_TEST_KMOD=m 599CONFIG_TEST_KMOD=m
603CONFIG_TEST_MEMCAT_P=m 600CONFIG_TEST_MEMCAT_P=m
601CONFIG_TEST_STACKINIT=m
604CONFIG_EARLY_PRINTK=y 602CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index ea2ebd4241c0..d865592a423e 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -49,6 +49,7 @@ CONFIG_TLS=m
49CONFIG_XFRM_MIGRATE=y 49CONFIG_XFRM_MIGRATE=y
50CONFIG_NET_KEY=y 50CONFIG_NET_KEY=y
51CONFIG_XDP_SOCKETS=y 51CONFIG_XDP_SOCKETS=y
52CONFIG_XDP_SOCKETS_DIAG=m
52CONFIG_INET=y 53CONFIG_INET=y
53CONFIG_IP_PNP=y 54CONFIG_IP_PNP=y
54CONFIG_IP_PNP_DHCP=y 55CONFIG_IP_PNP_DHCP=y
@@ -203,9 +204,6 @@ CONFIG_NFT_FIB_IPV4=m
203CONFIG_NF_TABLES_ARP=y 204CONFIG_NF_TABLES_ARP=y
204CONFIG_NF_FLOW_TABLE_IPV4=m 205CONFIG_NF_FLOW_TABLE_IPV4=m
205CONFIG_NF_LOG_ARP=m 206CONFIG_NF_LOG_ARP=m
206CONFIG_NFT_CHAIN_NAT_IPV4=m
207CONFIG_NFT_MASQ_IPV4=m
208CONFIG_NFT_REDIR_IPV4=m
209CONFIG_IP_NF_IPTABLES=m 207CONFIG_IP_NF_IPTABLES=m
210CONFIG_IP_NF_MATCH_AH=m 208CONFIG_IP_NF_MATCH_AH=m
211CONFIG_IP_NF_MATCH_ECN=m 209CONFIG_IP_NF_MATCH_ECN=m
@@ -227,9 +225,6 @@ CONFIG_IP_NF_ARPTABLES=m
227CONFIG_IP_NF_ARPFILTER=m 225CONFIG_IP_NF_ARPFILTER=m
228CONFIG_IP_NF_ARP_MANGLE=m 226CONFIG_IP_NF_ARP_MANGLE=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 227CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_CHAIN_NAT_IPV6=m
231CONFIG_NFT_MASQ_IPV6=m
232CONFIG_NFT_REDIR_IPV6=m
233CONFIG_NFT_DUP_IPV6=m 228CONFIG_NFT_DUP_IPV6=m
234CONFIG_NFT_FIB_IPV6=m 229CONFIG_NFT_FIB_IPV6=m
235CONFIG_NF_FLOW_TABLE_IPV6=m 230CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -306,7 +301,6 @@ CONFIG_AF_KCM=m
306# CONFIG_WIRELESS is not set 301# CONFIG_WIRELESS is not set
307CONFIG_PSAMPLE=m 302CONFIG_PSAMPLE=m
308CONFIG_NET_IFE=m 303CONFIG_NET_IFE=m
309CONFIG_NET_DEVLINK=m
310# CONFIG_UEVENT_HELPER is not set 304# CONFIG_UEVENT_HELPER is not set
311CONFIG_DEVTMPFS=y 305CONFIG_DEVTMPFS=y
312CONFIG_DEVTMPFS_MOUNT=y 306CONFIG_DEVTMPFS_MOUNT=y
@@ -413,12 +407,12 @@ CONFIG_RTC_DRV_GENERIC=m
413# CONFIG_VIRTIO_MENU is not set 407# CONFIG_VIRTIO_MENU is not set
414# CONFIG_IOMMU_SUPPORT is not set 408# CONFIG_IOMMU_SUPPORT is not set
415CONFIG_DAX=m 409CONFIG_DAX=m
410# CONFIG_VALIDATE_FS_PARSER is not set
416CONFIG_EXT4_FS=y 411CONFIG_EXT4_FS=y
417CONFIG_REISERFS_FS=m 412CONFIG_REISERFS_FS=m
418CONFIG_JFS_FS=m 413CONFIG_JFS_FS=m
419CONFIG_OCFS2_FS=m 414CONFIG_OCFS2_FS=m
420# CONFIG_OCFS2_DEBUG_MASKLOG is not set 415# CONFIG_OCFS2_DEBUG_MASKLOG is not set
421CONFIG_FS_ENCRYPTION=m
422CONFIG_FANOTIFY=y 416CONFIG_FANOTIFY=y
423CONFIG_QUOTA_NETLINK_INTERFACE=y 417CONFIG_QUOTA_NETLINK_INTERFACE=y
424# CONFIG_PRINT_QUOTA_WARNING is not set 418# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -526,9 +520,11 @@ CONFIG_CRYPTO_AEGIS256=m
526CONFIG_CRYPTO_MORUS640=m 520CONFIG_CRYPTO_MORUS640=m
527CONFIG_CRYPTO_MORUS1280=m 521CONFIG_CRYPTO_MORUS1280=m
528CONFIG_CRYPTO_CFB=m 522CONFIG_CRYPTO_CFB=m
523CONFIG_CRYPTO_CTS=m
529CONFIG_CRYPTO_LRW=m 524CONFIG_CRYPTO_LRW=m
530CONFIG_CRYPTO_OFB=m 525CONFIG_CRYPTO_OFB=m
531CONFIG_CRYPTO_PCBC=m 526CONFIG_CRYPTO_PCBC=m
527CONFIG_CRYPTO_XTS=m
532CONFIG_CRYPTO_KEYWRAP=m 528CONFIG_CRYPTO_KEYWRAP=m
533CONFIG_CRYPTO_ADIANTUM=m 529CONFIG_CRYPTO_ADIANTUM=m
534CONFIG_CRYPTO_XCBC=m 530CONFIG_CRYPTO_XCBC=m
@@ -593,6 +589,7 @@ CONFIG_TEST_OVERFLOW=m
593CONFIG_TEST_RHASHTABLE=m 589CONFIG_TEST_RHASHTABLE=m
594CONFIG_TEST_HASH=m 590CONFIG_TEST_HASH=m
595CONFIG_TEST_IDA=m 591CONFIG_TEST_IDA=m
592CONFIG_TEST_VMALLOC=m
596CONFIG_TEST_USER_COPY=m 593CONFIG_TEST_USER_COPY=m
597CONFIG_TEST_BPF=m 594CONFIG_TEST_BPF=m
598CONFIG_FIND_BIT_BENCHMARK=m 595CONFIG_FIND_BIT_BENCHMARK=m
@@ -602,4 +599,5 @@ CONFIG_TEST_UDELAY=m
602CONFIG_TEST_STATIC_KEYS=m 599CONFIG_TEST_STATIC_KEYS=m
603CONFIG_TEST_KMOD=m 600CONFIG_TEST_KMOD=m
604CONFIG_TEST_MEMCAT_P=m 601CONFIG_TEST_MEMCAT_P=m
602CONFIG_TEST_STACKINIT=m
605CONFIG_EARLY_PRINTK=y 603CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index cef6dc47c725..034a9de90484 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -50,6 +50,7 @@ CONFIG_TLS=m
50CONFIG_XFRM_MIGRATE=y 50CONFIG_XFRM_MIGRATE=y
51CONFIG_NET_KEY=y 51CONFIG_NET_KEY=y
52CONFIG_XDP_SOCKETS=y 52CONFIG_XDP_SOCKETS=y
53CONFIG_XDP_SOCKETS_DIAG=m
53CONFIG_INET=y 54CONFIG_INET=y
54CONFIG_IP_PNP=y 55CONFIG_IP_PNP=y
55CONFIG_IP_PNP_DHCP=y 56CONFIG_IP_PNP_DHCP=y
@@ -204,9 +205,6 @@ CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=y 205CONFIG_NF_TABLES_ARP=y
205CONFIG_NF_FLOW_TABLE_IPV4=m 206CONFIG_NF_FLOW_TABLE_IPV4=m
206CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
207CONFIG_NFT_CHAIN_NAT_IPV4=m
208CONFIG_NFT_MASQ_IPV4=m
209CONFIG_NFT_REDIR_IPV4=m
210CONFIG_IP_NF_IPTABLES=m 208CONFIG_IP_NF_IPTABLES=m
211CONFIG_IP_NF_MATCH_AH=m 209CONFIG_IP_NF_MATCH_AH=m
212CONFIG_IP_NF_MATCH_ECN=m 210CONFIG_IP_NF_MATCH_ECN=m
@@ -228,9 +226,6 @@ CONFIG_IP_NF_ARPTABLES=m
228CONFIG_IP_NF_ARPFILTER=m 226CONFIG_IP_NF_ARPFILTER=m
229CONFIG_IP_NF_ARP_MANGLE=m 227CONFIG_IP_NF_ARP_MANGLE=m
230CONFIG_NFT_CHAIN_ROUTE_IPV6=m 228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
231CONFIG_NFT_CHAIN_NAT_IPV6=m
232CONFIG_NFT_MASQ_IPV6=m
233CONFIG_NFT_REDIR_IPV6=m
234CONFIG_NFT_DUP_IPV6=m 229CONFIG_NFT_DUP_IPV6=m
235CONFIG_NFT_FIB_IPV6=m 230CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m 231CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -307,7 +302,6 @@ CONFIG_AF_KCM=m
307# CONFIG_WIRELESS is not set 302# CONFIG_WIRELESS is not set
308CONFIG_PSAMPLE=m 303CONFIG_PSAMPLE=m
309CONFIG_NET_IFE=m 304CONFIG_NET_IFE=m
310CONFIG_NET_DEVLINK=m
311# CONFIG_UEVENT_HELPER is not set 305# CONFIG_UEVENT_HELPER is not set
312CONFIG_DEVTMPFS=y 306CONFIG_DEVTMPFS=y
313CONFIG_DEVTMPFS_MOUNT=y 307CONFIG_DEVTMPFS_MOUNT=y
@@ -431,12 +425,12 @@ CONFIG_RTC_DRV_GENERIC=m
431# CONFIG_VIRTIO_MENU is not set 425# CONFIG_VIRTIO_MENU is not set
432# CONFIG_IOMMU_SUPPORT is not set 426# CONFIG_IOMMU_SUPPORT is not set
433CONFIG_DAX=m 427CONFIG_DAX=m
428# CONFIG_VALIDATE_FS_PARSER is not set
434CONFIG_EXT4_FS=y 429CONFIG_EXT4_FS=y
435CONFIG_REISERFS_FS=m 430CONFIG_REISERFS_FS=m
436CONFIG_JFS_FS=m 431CONFIG_JFS_FS=m
437CONFIG_OCFS2_FS=m 432CONFIG_OCFS2_FS=m
438# CONFIG_OCFS2_DEBUG_MASKLOG is not set 433# CONFIG_OCFS2_DEBUG_MASKLOG is not set
439CONFIG_FS_ENCRYPTION=m
440CONFIG_FANOTIFY=y 434CONFIG_FANOTIFY=y
441CONFIG_QUOTA_NETLINK_INTERFACE=y 435CONFIG_QUOTA_NETLINK_INTERFACE=y
442# CONFIG_PRINT_QUOTA_WARNING is not set 436# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -544,9 +538,11 @@ CONFIG_CRYPTO_AEGIS256=m
544CONFIG_CRYPTO_MORUS640=m 538CONFIG_CRYPTO_MORUS640=m
545CONFIG_CRYPTO_MORUS1280=m 539CONFIG_CRYPTO_MORUS1280=m
546CONFIG_CRYPTO_CFB=m 540CONFIG_CRYPTO_CFB=m
541CONFIG_CRYPTO_CTS=m
547CONFIG_CRYPTO_LRW=m 542CONFIG_CRYPTO_LRW=m
548CONFIG_CRYPTO_OFB=m 543CONFIG_CRYPTO_OFB=m
549CONFIG_CRYPTO_PCBC=m 544CONFIG_CRYPTO_PCBC=m
545CONFIG_CRYPTO_XTS=m
550CONFIG_CRYPTO_KEYWRAP=m 546CONFIG_CRYPTO_KEYWRAP=m
551CONFIG_CRYPTO_ADIANTUM=m 547CONFIG_CRYPTO_ADIANTUM=m
552CONFIG_CRYPTO_XCBC=m 548CONFIG_CRYPTO_XCBC=m
@@ -611,6 +607,7 @@ CONFIG_TEST_OVERFLOW=m
611CONFIG_TEST_RHASHTABLE=m 607CONFIG_TEST_RHASHTABLE=m
612CONFIG_TEST_HASH=m 608CONFIG_TEST_HASH=m
613CONFIG_TEST_IDA=m 609CONFIG_TEST_IDA=m
610CONFIG_TEST_VMALLOC=m
614CONFIG_TEST_USER_COPY=m 611CONFIG_TEST_USER_COPY=m
615CONFIG_TEST_BPF=m 612CONFIG_TEST_BPF=m
616CONFIG_FIND_BIT_BENCHMARK=m 613CONFIG_FIND_BIT_BENCHMARK=m
@@ -620,4 +617,5 @@ CONFIG_TEST_UDELAY=m
620CONFIG_TEST_STATIC_KEYS=m 617CONFIG_TEST_STATIC_KEYS=m
621CONFIG_TEST_KMOD=m 618CONFIG_TEST_KMOD=m
622CONFIG_TEST_MEMCAT_P=m 619CONFIG_TEST_MEMCAT_P=m
620CONFIG_TEST_STACKINIT=m
623CONFIG_EARLY_PRINTK=y 621CONFIG_EARLY_PRINTK=y
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 69f2282dc4e9..49be0f9fcd8d 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -46,6 +46,7 @@ CONFIG_TLS=m
46CONFIG_XFRM_MIGRATE=y 46CONFIG_XFRM_MIGRATE=y
47CONFIG_NET_KEY=y 47CONFIG_NET_KEY=y
48CONFIG_XDP_SOCKETS=y 48CONFIG_XDP_SOCKETS=y
49CONFIG_XDP_SOCKETS_DIAG=m
49CONFIG_INET=y 50CONFIG_INET=y
50CONFIG_IP_PNP=y 51CONFIG_IP_PNP=y
51CONFIG_IP_PNP_DHCP=y 52CONFIG_IP_PNP_DHCP=y
@@ -200,9 +201,6 @@ CONFIG_NFT_FIB_IPV4=m
200CONFIG_NF_TABLES_ARP=y 201CONFIG_NF_TABLES_ARP=y
201CONFIG_NF_FLOW_TABLE_IPV4=m 202CONFIG_NF_FLOW_TABLE_IPV4=m
202CONFIG_NF_LOG_ARP=m 203CONFIG_NF_LOG_ARP=m
203CONFIG_NFT_CHAIN_NAT_IPV4=m
204CONFIG_NFT_MASQ_IPV4=m
205CONFIG_NFT_REDIR_IPV4=m
206CONFIG_IP_NF_IPTABLES=m 204CONFIG_IP_NF_IPTABLES=m
207CONFIG_IP_NF_MATCH_AH=m 205CONFIG_IP_NF_MATCH_AH=m
208CONFIG_IP_NF_MATCH_ECN=m 206CONFIG_IP_NF_MATCH_ECN=m
@@ -224,9 +222,6 @@ CONFIG_IP_NF_ARPTABLES=m
224CONFIG_IP_NF_ARPFILTER=m 222CONFIG_IP_NF_ARPFILTER=m
225CONFIG_IP_NF_ARP_MANGLE=m 223CONFIG_IP_NF_ARP_MANGLE=m
226CONFIG_NFT_CHAIN_ROUTE_IPV6=m 224CONFIG_NFT_CHAIN_ROUTE_IPV6=m
227CONFIG_NFT_CHAIN_NAT_IPV6=m
228CONFIG_NFT_MASQ_IPV6=m
229CONFIG_NFT_REDIR_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 225CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 226CONFIG_NFT_FIB_IPV6=m
232CONFIG_NF_FLOW_TABLE_IPV6=m 227CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -303,7 +298,6 @@ CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 298# CONFIG_WIRELESS is not set
304CONFIG_PSAMPLE=m 299CONFIG_PSAMPLE=m
305CONFIG_NET_IFE=m 300CONFIG_NET_IFE=m
306CONFIG_NET_DEVLINK=m
307# CONFIG_UEVENT_HELPER is not set 301# CONFIG_UEVENT_HELPER is not set
308CONFIG_DEVTMPFS=y 302CONFIG_DEVTMPFS=y
309CONFIG_DEVTMPFS_MOUNT=y 303CONFIG_DEVTMPFS_MOUNT=y
@@ -415,12 +409,12 @@ CONFIG_RTC_DRV_GENERIC=m
415# CONFIG_VIRTIO_MENU is not set 409# CONFIG_VIRTIO_MENU is not set
416# CONFIG_IOMMU_SUPPORT is not set 410# CONFIG_IOMMU_SUPPORT is not set
417CONFIG_DAX=m 411CONFIG_DAX=m
412# CONFIG_VALIDATE_FS_PARSER is not set
418CONFIG_EXT4_FS=y 413CONFIG_EXT4_FS=y
419CONFIG_REISERFS_FS=m 414CONFIG_REISERFS_FS=m
420CONFIG_JFS_FS=m 415CONFIG_JFS_FS=m
421CONFIG_OCFS2_FS=m 416CONFIG_OCFS2_FS=m
422# CONFIG_OCFS2_DEBUG_MASKLOG is not set 417# CONFIG_OCFS2_DEBUG_MASKLOG is not set
423CONFIG_FS_ENCRYPTION=m
424CONFIG_FANOTIFY=y 418CONFIG_FANOTIFY=y
425CONFIG_QUOTA_NETLINK_INTERFACE=y 419CONFIG_QUOTA_NETLINK_INTERFACE=y
426# CONFIG_PRINT_QUOTA_WARNING is not set 420# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -528,9 +522,11 @@ CONFIG_CRYPTO_AEGIS256=m
528CONFIG_CRYPTO_MORUS640=m 522CONFIG_CRYPTO_MORUS640=m
529CONFIG_CRYPTO_MORUS1280=m 523CONFIG_CRYPTO_MORUS1280=m
530CONFIG_CRYPTO_CFB=m 524CONFIG_CRYPTO_CFB=m
525CONFIG_CRYPTO_CTS=m
531CONFIG_CRYPTO_LRW=m 526CONFIG_CRYPTO_LRW=m
532CONFIG_CRYPTO_OFB=m 527CONFIG_CRYPTO_OFB=m
533CONFIG_CRYPTO_PCBC=m 528CONFIG_CRYPTO_PCBC=m
529CONFIG_CRYPTO_XTS=m
534CONFIG_CRYPTO_KEYWRAP=m 530CONFIG_CRYPTO_KEYWRAP=m
535CONFIG_CRYPTO_ADIANTUM=m 531CONFIG_CRYPTO_ADIANTUM=m
536CONFIG_CRYPTO_XCBC=m 532CONFIG_CRYPTO_XCBC=m
@@ -595,6 +591,7 @@ CONFIG_TEST_OVERFLOW=m
595CONFIG_TEST_RHASHTABLE=m 591CONFIG_TEST_RHASHTABLE=m
596CONFIG_TEST_HASH=m 592CONFIG_TEST_HASH=m
597CONFIG_TEST_IDA=m 593CONFIG_TEST_IDA=m
594CONFIG_TEST_VMALLOC=m
598CONFIG_TEST_USER_COPY=m 595CONFIG_TEST_USER_COPY=m
599CONFIG_TEST_BPF=m 596CONFIG_TEST_BPF=m
600CONFIG_FIND_BIT_BENCHMARK=m 597CONFIG_FIND_BIT_BENCHMARK=m
@@ -604,3 +601,4 @@ CONFIG_TEST_UDELAY=m
604CONFIG_TEST_STATIC_KEYS=m 601CONFIG_TEST_STATIC_KEYS=m
605CONFIG_TEST_KMOD=m 602CONFIG_TEST_KMOD=m
606CONFIG_TEST_MEMCAT_P=m 603CONFIG_TEST_MEMCAT_P=m
604CONFIG_TEST_STACKINIT=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index e91267e868b2..a71acf4a6004 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -46,6 +46,7 @@ CONFIG_TLS=m
46CONFIG_XFRM_MIGRATE=y 46CONFIG_XFRM_MIGRATE=y
47CONFIG_NET_KEY=y 47CONFIG_NET_KEY=y
48CONFIG_XDP_SOCKETS=y 48CONFIG_XDP_SOCKETS=y
49CONFIG_XDP_SOCKETS_DIAG=m
49CONFIG_INET=y 50CONFIG_INET=y
50CONFIG_IP_PNP=y 51CONFIG_IP_PNP=y
51CONFIG_IP_PNP_DHCP=y 52CONFIG_IP_PNP_DHCP=y
@@ -200,9 +201,6 @@ CONFIG_NFT_FIB_IPV4=m
200CONFIG_NF_TABLES_ARP=y 201CONFIG_NF_TABLES_ARP=y
201CONFIG_NF_FLOW_TABLE_IPV4=m 202CONFIG_NF_FLOW_TABLE_IPV4=m
202CONFIG_NF_LOG_ARP=m 203CONFIG_NF_LOG_ARP=m
203CONFIG_NFT_CHAIN_NAT_IPV4=m
204CONFIG_NFT_MASQ_IPV4=m
205CONFIG_NFT_REDIR_IPV4=m
206CONFIG_IP_NF_IPTABLES=m 204CONFIG_IP_NF_IPTABLES=m
207CONFIG_IP_NF_MATCH_AH=m 205CONFIG_IP_NF_MATCH_AH=m
208CONFIG_IP_NF_MATCH_ECN=m 206CONFIG_IP_NF_MATCH_ECN=m
@@ -224,9 +222,6 @@ CONFIG_IP_NF_ARPTABLES=m
224CONFIG_IP_NF_ARPFILTER=m 222CONFIG_IP_NF_ARPFILTER=m
225CONFIG_IP_NF_ARP_MANGLE=m 223CONFIG_IP_NF_ARP_MANGLE=m
226CONFIG_NFT_CHAIN_ROUTE_IPV6=m 224CONFIG_NFT_CHAIN_ROUTE_IPV6=m
227CONFIG_NFT_CHAIN_NAT_IPV6=m
228CONFIG_NFT_MASQ_IPV6=m
229CONFIG_NFT_REDIR_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 225CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 226CONFIG_NFT_FIB_IPV6=m
232CONFIG_NF_FLOW_TABLE_IPV6=m 227CONFIG_NF_FLOW_TABLE_IPV6=m
@@ -303,7 +298,6 @@ CONFIG_AF_KCM=m
303# CONFIG_WIRELESS is not set 298# CONFIG_WIRELESS is not set
304CONFIG_PSAMPLE=m 299CONFIG_PSAMPLE=m
305CONFIG_NET_IFE=m 300CONFIG_NET_IFE=m
306CONFIG_NET_DEVLINK=m
307# CONFIG_UEVENT_HELPER is not set 301# CONFIG_UEVENT_HELPER is not set
308CONFIG_DEVTMPFS=y 302CONFIG_DEVTMPFS=y
309CONFIG_DEVTMPFS_MOUNT=y 303CONFIG_DEVTMPFS_MOUNT=y
@@ -414,12 +408,12 @@ CONFIG_RTC_DRV_GENERIC=m
414# CONFIG_VIRTIO_MENU is not set 408# CONFIG_VIRTIO_MENU is not set
415# CONFIG_IOMMU_SUPPORT is not set 409# CONFIG_IOMMU_SUPPORT is not set
416CONFIG_DAX=m 410CONFIG_DAX=m
411# CONFIG_VALIDATE_FS_PARSER is not set
417CONFIG_EXT4_FS=y 412CONFIG_EXT4_FS=y
418CONFIG_REISERFS_FS=m 413CONFIG_REISERFS_FS=m
419CONFIG_JFS_FS=m 414CONFIG_JFS_FS=m
420CONFIG_OCFS2_FS=m 415CONFIG_OCFS2_FS=m
421# CONFIG_OCFS2_DEBUG_MASKLOG is not set 416# CONFIG_OCFS2_DEBUG_MASKLOG is not set
422CONFIG_FS_ENCRYPTION=m
423CONFIG_FANOTIFY=y 417CONFIG_FANOTIFY=y
424CONFIG_QUOTA_NETLINK_INTERFACE=y 418CONFIG_QUOTA_NETLINK_INTERFACE=y
425# CONFIG_PRINT_QUOTA_WARNING is not set 419# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -527,9 +521,11 @@ CONFIG_CRYPTO_AEGIS256=m
527CONFIG_CRYPTO_MORUS640=m 521CONFIG_CRYPTO_MORUS640=m
528CONFIG_CRYPTO_MORUS1280=m 522CONFIG_CRYPTO_MORUS1280=m
529CONFIG_CRYPTO_CFB=m 523CONFIG_CRYPTO_CFB=m
524CONFIG_CRYPTO_CTS=m
530CONFIG_CRYPTO_LRW=m 525CONFIG_CRYPTO_LRW=m
531CONFIG_CRYPTO_OFB=m 526CONFIG_CRYPTO_OFB=m
532CONFIG_CRYPTO_PCBC=m 527CONFIG_CRYPTO_PCBC=m
528CONFIG_CRYPTO_XTS=m
533CONFIG_CRYPTO_KEYWRAP=m 529CONFIG_CRYPTO_KEYWRAP=m
534CONFIG_CRYPTO_ADIANTUM=m 530CONFIG_CRYPTO_ADIANTUM=m
535CONFIG_CRYPTO_XCBC=m 531CONFIG_CRYPTO_XCBC=m
@@ -594,6 +590,7 @@ CONFIG_TEST_OVERFLOW=m
594CONFIG_TEST_RHASHTABLE=m 590CONFIG_TEST_RHASHTABLE=m
595CONFIG_TEST_HASH=m 591CONFIG_TEST_HASH=m
596CONFIG_TEST_IDA=m 592CONFIG_TEST_IDA=m
593CONFIG_TEST_VMALLOC=m
597CONFIG_TEST_USER_COPY=m 594CONFIG_TEST_USER_COPY=m
598CONFIG_TEST_BPF=m 595CONFIG_TEST_BPF=m
599CONFIG_FIND_BIT_BENCHMARK=m 596CONFIG_FIND_BIT_BENCHMARK=m
@@ -603,4 +600,5 @@ CONFIG_TEST_UDELAY=m
603CONFIG_TEST_STATIC_KEYS=m 600CONFIG_TEST_STATIC_KEYS=m
604CONFIG_TEST_KMOD=m 601CONFIG_TEST_KMOD=m
605CONFIG_TEST_MEMCAT_P=m 602CONFIG_TEST_MEMCAT_P=m
603CONFIG_TEST_STACKINIT=m
606CONFIG_EARLY_PRINTK=y 604CONFIG_EARLY_PRINTK=y
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-02 13:44:07 -0500