diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-04-30 04:04:11 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-05-22 04:31:53 -0400 |
commit | 5bcf938117479f6e07dd5f97e3d8e56b5657e22a (patch) | |
tree | 5c2c5d7655120e51978c3332fc0130f4b06746ec | |
parent | 7124330dabe5b3cb3bdfaa31cf584e1709b16fc3 (diff) |
m68k/defconfig: Update defconfigs for v4.17-rc3
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 20 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 20 |
12 files changed, 144 insertions, 96 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 37a8e5ab8728..a874e54404d1 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -98,8 +98,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
98 | CONFIG_NF_CONNTRACK_SIP=m | 98 | CONFIG_NF_CONNTRACK_SIP=m |
99 | CONFIG_NF_CONNTRACK_TFTP=m | 99 | CONFIG_NF_CONNTRACK_TFTP=m |
100 | CONFIG_NF_TABLES=m | 100 | CONFIG_NF_TABLES=m |
101 | CONFIG_NF_TABLES_INET=m | 101 | CONFIG_NF_TABLES_INET=y |
102 | CONFIG_NF_TABLES_NETDEV=m | 102 | CONFIG_NF_TABLES_NETDEV=y |
103 | CONFIG_NFT_EXTHDR=m | 103 | CONFIG_NFT_EXTHDR=m |
104 | CONFIG_NFT_META=m | 104 | CONFIG_NFT_META=m |
105 | CONFIG_NFT_RT=m | 105 | CONFIG_NFT_RT=m |
@@ -204,7 +204,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
204 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 204 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
205 | CONFIG_NFT_DUP_IPV4=m | 205 | CONFIG_NFT_DUP_IPV4=m |
206 | CONFIG_NFT_FIB_IPV4=m | 206 | CONFIG_NFT_FIB_IPV4=m |
207 | CONFIG_NF_TABLES_ARP=m | 207 | CONFIG_NF_TABLES_ARP=y |
208 | CONFIG_NF_FLOW_TABLE_IPV4=m | 208 | CONFIG_NF_FLOW_TABLE_IPV4=m |
209 | CONFIG_NF_LOG_ARP=m | 209 | CONFIG_NF_LOG_ARP=m |
210 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 210 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -233,12 +233,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
233 | CONFIG_NF_CONNTRACK_IPV6=m | 233 | CONFIG_NF_CONNTRACK_IPV6=m |
234 | CONFIG_NF_SOCKET_IPV6=m | 234 | CONFIG_NF_SOCKET_IPV6=m |
235 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 235 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
236 | CONFIG_NFT_DUP_IPV6=m | ||
237 | CONFIG_NFT_FIB_IPV6=m | ||
238 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
239 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 236 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
240 | CONFIG_NFT_MASQ_IPV6=m | 237 | CONFIG_NFT_MASQ_IPV6=m |
241 | CONFIG_NFT_REDIR_IPV6=m | 238 | CONFIG_NFT_REDIR_IPV6=m |
239 | CONFIG_NFT_DUP_IPV6=m | ||
240 | CONFIG_NFT_FIB_IPV6=m | ||
241 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
242 | CONFIG_IP6_NF_IPTABLES=m | 242 | CONFIG_IP6_NF_IPTABLES=m |
243 | CONFIG_IP6_NF_MATCH_AH=m | 243 | CONFIG_IP6_NF_MATCH_AH=m |
244 | CONFIG_IP6_NF_MATCH_EUI64=m | 244 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -259,7 +259,7 @@ CONFIG_IP6_NF_RAW=m | |||
259 | CONFIG_IP6_NF_NAT=m | 259 | CONFIG_IP6_NF_NAT=m |
260 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 260 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
261 | CONFIG_IP6_NF_TARGET_NPT=m | 261 | CONFIG_IP6_NF_TARGET_NPT=m |
262 | CONFIG_NF_TABLES_BRIDGE=m | 262 | CONFIG_NF_TABLES_BRIDGE=y |
263 | CONFIG_NFT_BRIDGE_META=m | 263 | CONFIG_NFT_BRIDGE_META=m |
264 | CONFIG_NFT_BRIDGE_REJECT=m | 264 | CONFIG_NFT_BRIDGE_REJECT=m |
265 | CONFIG_NF_LOG_BRIDGE=m | 265 | CONFIG_NF_LOG_BRIDGE=m |
@@ -310,7 +310,6 @@ CONFIG_NET_MPLS_GSO=m | |||
310 | CONFIG_MPLS_ROUTING=m | 310 | CONFIG_MPLS_ROUTING=m |
311 | CONFIG_MPLS_IPTUNNEL=m | 311 | CONFIG_MPLS_IPTUNNEL=m |
312 | CONFIG_NET_NSH=m | 312 | CONFIG_NET_NSH=m |
313 | CONFIG_NET_L3_MASTER_DEV=y | ||
314 | CONFIG_AF_KCM=m | 313 | CONFIG_AF_KCM=m |
315 | # CONFIG_WIRELESS is not set | 314 | # CONFIG_WIRELESS is not set |
316 | CONFIG_PSAMPLE=m | 315 | CONFIG_PSAMPLE=m |
@@ -414,6 +413,7 @@ CONFIG_ARIADNE=y | |||
414 | # CONFIG_NET_VENDOR_MARVELL is not set | 413 | # CONFIG_NET_VENDOR_MARVELL is not set |
415 | # CONFIG_NET_VENDOR_MICREL is not set | 414 | # CONFIG_NET_VENDOR_MICREL is not set |
416 | # CONFIG_NET_VENDOR_NETRONOME is not set | 415 | # CONFIG_NET_VENDOR_NETRONOME is not set |
416 | # CONFIG_NET_VENDOR_NI is not set | ||
417 | CONFIG_HYDRA=y | 417 | CONFIG_HYDRA=y |
418 | CONFIG_APNE=y | 418 | CONFIG_APNE=y |
419 | CONFIG_ZORRO8390=y | 419 | CONFIG_ZORRO8390=y |
@@ -485,6 +485,7 @@ CONFIG_RTC_DRV_MSM6242=m | |||
485 | CONFIG_RTC_DRV_RP5C01=m | 485 | CONFIG_RTC_DRV_RP5C01=m |
486 | # CONFIG_VIRTIO_MENU is not set | 486 | # CONFIG_VIRTIO_MENU is not set |
487 | # CONFIG_IOMMU_SUPPORT is not set | 487 | # CONFIG_IOMMU_SUPPORT is not set |
488 | CONFIG_DAX=m | ||
488 | CONFIG_HEARTBEAT=y | 489 | CONFIG_HEARTBEAT=y |
489 | CONFIG_PROC_HARDWARE=y | 490 | CONFIG_PROC_HARDWARE=y |
490 | CONFIG_AMIGA_BUILTIN_SERIAL=y | 491 | CONFIG_AMIGA_BUILTIN_SERIAL=y |
@@ -621,6 +622,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
621 | CONFIG_CRYPTO_MCRYPTD=m | 622 | CONFIG_CRYPTO_MCRYPTD=m |
622 | CONFIG_CRYPTO_TEST=m | 623 | CONFIG_CRYPTO_TEST=m |
623 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 624 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
625 | CONFIG_CRYPTO_CFB=m | ||
624 | CONFIG_CRYPTO_LRW=m | 626 | CONFIG_CRYPTO_LRW=m |
625 | CONFIG_CRYPTO_PCBC=m | 627 | CONFIG_CRYPTO_PCBC=m |
626 | CONFIG_CRYPTO_KEYWRAP=m | 628 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -647,6 +649,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
647 | CONFIG_CRYPTO_SALSA20=m | 649 | CONFIG_CRYPTO_SALSA20=m |
648 | CONFIG_CRYPTO_SEED=m | 650 | CONFIG_CRYPTO_SEED=m |
649 | CONFIG_CRYPTO_SERPENT=m | 651 | CONFIG_CRYPTO_SERPENT=m |
652 | CONFIG_CRYPTO_SM4=m | ||
653 | CONFIG_CRYPTO_SPECK=m | ||
650 | CONFIG_CRYPTO_TEA=m | 654 | CONFIG_CRYPTO_TEA=m |
651 | CONFIG_CRYPTO_TWOFISH=m | 655 | CONFIG_CRYPTO_TWOFISH=m |
652 | CONFIG_CRYPTO_LZO=m | 656 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 6a466266b852..8ce39e23aa42 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
96 | CONFIG_NF_CONNTRACK_SIP=m | 96 | CONFIG_NF_CONNTRACK_SIP=m |
97 | CONFIG_NF_CONNTRACK_TFTP=m | 97 | CONFIG_NF_CONNTRACK_TFTP=m |
98 | CONFIG_NF_TABLES=m | 98 | CONFIG_NF_TABLES=m |
99 | CONFIG_NF_TABLES_INET=m | 99 | CONFIG_NF_TABLES_INET=y |
100 | CONFIG_NF_TABLES_NETDEV=m | 100 | CONFIG_NF_TABLES_NETDEV=y |
101 | CONFIG_NFT_EXTHDR=m | 101 | CONFIG_NFT_EXTHDR=m |
102 | CONFIG_NFT_META=m | 102 | CONFIG_NFT_META=m |
103 | CONFIG_NFT_RT=m | 103 | CONFIG_NFT_RT=m |
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
203 | CONFIG_NFT_DUP_IPV4=m | 203 | CONFIG_NFT_DUP_IPV4=m |
204 | CONFIG_NFT_FIB_IPV4=m | 204 | CONFIG_NFT_FIB_IPV4=m |
205 | CONFIG_NF_TABLES_ARP=m | 205 | CONFIG_NF_TABLES_ARP=y |
206 | CONFIG_NF_FLOW_TABLE_IPV4=m | 206 | CONFIG_NF_FLOW_TABLE_IPV4=m |
207 | CONFIG_NF_LOG_ARP=m | 207 | CONFIG_NF_LOG_ARP=m |
208 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 208 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
231 | CONFIG_NF_CONNTRACK_IPV6=m | 231 | CONFIG_NF_CONNTRACK_IPV6=m |
232 | CONFIG_NF_SOCKET_IPV6=m | 232 | CONFIG_NF_SOCKET_IPV6=m |
233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
234 | CONFIG_NFT_DUP_IPV6=m | ||
235 | CONFIG_NFT_FIB_IPV6=m | ||
236 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
237 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 234 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
238 | CONFIG_NFT_MASQ_IPV6=m | 235 | CONFIG_NFT_MASQ_IPV6=m |
239 | CONFIG_NFT_REDIR_IPV6=m | 236 | CONFIG_NFT_REDIR_IPV6=m |
237 | CONFIG_NFT_DUP_IPV6=m | ||
238 | CONFIG_NFT_FIB_IPV6=m | ||
239 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
240 | CONFIG_IP6_NF_IPTABLES=m | 240 | CONFIG_IP6_NF_IPTABLES=m |
241 | CONFIG_IP6_NF_MATCH_AH=m | 241 | CONFIG_IP6_NF_MATCH_AH=m |
242 | CONFIG_IP6_NF_MATCH_EUI64=m | 242 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m | |||
257 | CONFIG_IP6_NF_NAT=m | 257 | CONFIG_IP6_NF_NAT=m |
258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
259 | CONFIG_IP6_NF_TARGET_NPT=m | 259 | CONFIG_IP6_NF_TARGET_NPT=m |
260 | CONFIG_NF_TABLES_BRIDGE=m | 260 | CONFIG_NF_TABLES_BRIDGE=y |
261 | CONFIG_NFT_BRIDGE_META=m | 261 | CONFIG_NFT_BRIDGE_META=m |
262 | CONFIG_NFT_BRIDGE_REJECT=m | 262 | CONFIG_NFT_BRIDGE_REJECT=m |
263 | CONFIG_NF_LOG_BRIDGE=m | 263 | CONFIG_NF_LOG_BRIDGE=m |
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m | |||
308 | CONFIG_MPLS_ROUTING=m | 308 | CONFIG_MPLS_ROUTING=m |
309 | CONFIG_MPLS_IPTUNNEL=m | 309 | CONFIG_MPLS_IPTUNNEL=m |
310 | CONFIG_NET_NSH=m | 310 | CONFIG_NET_NSH=m |
311 | CONFIG_NET_L3_MASTER_DEV=y | ||
312 | CONFIG_AF_KCM=m | 311 | CONFIG_AF_KCM=m |
313 | # CONFIG_WIRELESS is not set | 312 | # CONFIG_WIRELESS is not set |
314 | CONFIG_PSAMPLE=m | 313 | CONFIG_PSAMPLE=m |
@@ -392,6 +391,7 @@ CONFIG_VETH=m | |||
392 | # CONFIG_NET_VENDOR_MICREL is not set | 391 | # CONFIG_NET_VENDOR_MICREL is not set |
393 | # CONFIG_NET_VENDOR_NATSEMI is not set | 392 | # CONFIG_NET_VENDOR_NATSEMI is not set |
394 | # CONFIG_NET_VENDOR_NETRONOME is not set | 393 | # CONFIG_NET_VENDOR_NETRONOME is not set |
394 | # CONFIG_NET_VENDOR_NI is not set | ||
395 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 395 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
396 | # CONFIG_NET_VENDOR_RENESAS is not set | 396 | # CONFIG_NET_VENDOR_RENESAS is not set |
397 | # CONFIG_NET_VENDOR_ROCKER is not set | 397 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -446,6 +446,7 @@ CONFIG_RTC_CLASS=y | |||
446 | CONFIG_RTC_DRV_GENERIC=m | 446 | CONFIG_RTC_DRV_GENERIC=m |
447 | # CONFIG_VIRTIO_MENU is not set | 447 | # CONFIG_VIRTIO_MENU is not set |
448 | # CONFIG_IOMMU_SUPPORT is not set | 448 | # CONFIG_IOMMU_SUPPORT is not set |
449 | CONFIG_DAX=m | ||
449 | CONFIG_HEARTBEAT=y | 450 | CONFIG_HEARTBEAT=y |
450 | CONFIG_PROC_HARDWARE=y | 451 | CONFIG_PROC_HARDWARE=y |
451 | CONFIG_EXT4_FS=y | 452 | CONFIG_EXT4_FS=y |
@@ -580,6 +581,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
580 | CONFIG_CRYPTO_MCRYPTD=m | 581 | CONFIG_CRYPTO_MCRYPTD=m |
581 | CONFIG_CRYPTO_TEST=m | 582 | CONFIG_CRYPTO_TEST=m |
582 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 583 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
584 | CONFIG_CRYPTO_CFB=m | ||
583 | CONFIG_CRYPTO_LRW=m | 585 | CONFIG_CRYPTO_LRW=m |
584 | CONFIG_CRYPTO_PCBC=m | 586 | CONFIG_CRYPTO_PCBC=m |
585 | CONFIG_CRYPTO_KEYWRAP=m | 587 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -606,6 +608,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
606 | CONFIG_CRYPTO_SALSA20=m | 608 | CONFIG_CRYPTO_SALSA20=m |
607 | CONFIG_CRYPTO_SEED=m | 609 | CONFIG_CRYPTO_SEED=m |
608 | CONFIG_CRYPTO_SERPENT=m | 610 | CONFIG_CRYPTO_SERPENT=m |
611 | CONFIG_CRYPTO_SM4=m | ||
612 | CONFIG_CRYPTO_SPECK=m | ||
609 | CONFIG_CRYPTO_TEA=m | 613 | CONFIG_CRYPTO_TEA=m |
610 | CONFIG_CRYPTO_TWOFISH=m | 614 | CONFIG_CRYPTO_TWOFISH=m |
611 | CONFIG_CRYPTO_LZO=m | 615 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index b0691a7a3345..346c4e75edf8 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
96 | CONFIG_NF_CONNTRACK_SIP=m | 96 | CONFIG_NF_CONNTRACK_SIP=m |
97 | CONFIG_NF_CONNTRACK_TFTP=m | 97 | CONFIG_NF_CONNTRACK_TFTP=m |
98 | CONFIG_NF_TABLES=m | 98 | CONFIG_NF_TABLES=m |
99 | CONFIG_NF_TABLES_INET=m | 99 | CONFIG_NF_TABLES_INET=y |
100 | CONFIG_NF_TABLES_NETDEV=m | 100 | CONFIG_NF_TABLES_NETDEV=y |
101 | CONFIG_NFT_EXTHDR=m | 101 | CONFIG_NFT_EXTHDR=m |
102 | CONFIG_NFT_META=m | 102 | CONFIG_NFT_META=m |
103 | CONFIG_NFT_RT=m | 103 | CONFIG_NFT_RT=m |
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
203 | CONFIG_NFT_DUP_IPV4=m | 203 | CONFIG_NFT_DUP_IPV4=m |
204 | CONFIG_NFT_FIB_IPV4=m | 204 | CONFIG_NFT_FIB_IPV4=m |
205 | CONFIG_NF_TABLES_ARP=m | 205 | CONFIG_NF_TABLES_ARP=y |
206 | CONFIG_NF_FLOW_TABLE_IPV4=m | 206 | CONFIG_NF_FLOW_TABLE_IPV4=m |
207 | CONFIG_NF_LOG_ARP=m | 207 | CONFIG_NF_LOG_ARP=m |
208 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 208 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
231 | CONFIG_NF_CONNTRACK_IPV6=m | 231 | CONFIG_NF_CONNTRACK_IPV6=m |
232 | CONFIG_NF_SOCKET_IPV6=m | 232 | CONFIG_NF_SOCKET_IPV6=m |
233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
234 | CONFIG_NFT_DUP_IPV6=m | ||
235 | CONFIG_NFT_FIB_IPV6=m | ||
236 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
237 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 234 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
238 | CONFIG_NFT_MASQ_IPV6=m | 235 | CONFIG_NFT_MASQ_IPV6=m |
239 | CONFIG_NFT_REDIR_IPV6=m | 236 | CONFIG_NFT_REDIR_IPV6=m |
237 | CONFIG_NFT_DUP_IPV6=m | ||
238 | CONFIG_NFT_FIB_IPV6=m | ||
239 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
240 | CONFIG_IP6_NF_IPTABLES=m | 240 | CONFIG_IP6_NF_IPTABLES=m |
241 | CONFIG_IP6_NF_MATCH_AH=m | 241 | CONFIG_IP6_NF_MATCH_AH=m |
242 | CONFIG_IP6_NF_MATCH_EUI64=m | 242 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m | |||
257 | CONFIG_IP6_NF_NAT=m | 257 | CONFIG_IP6_NF_NAT=m |
258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
259 | CONFIG_IP6_NF_TARGET_NPT=m | 259 | CONFIG_IP6_NF_TARGET_NPT=m |
260 | CONFIG_NF_TABLES_BRIDGE=m | 260 | CONFIG_NF_TABLES_BRIDGE=y |
261 | CONFIG_NFT_BRIDGE_META=m | 261 | CONFIG_NFT_BRIDGE_META=m |
262 | CONFIG_NFT_BRIDGE_REJECT=m | 262 | CONFIG_NFT_BRIDGE_REJECT=m |
263 | CONFIG_NF_LOG_BRIDGE=m | 263 | CONFIG_NF_LOG_BRIDGE=m |
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m | |||
308 | CONFIG_MPLS_ROUTING=m | 308 | CONFIG_MPLS_ROUTING=m |
309 | CONFIG_MPLS_IPTUNNEL=m | 309 | CONFIG_MPLS_IPTUNNEL=m |
310 | CONFIG_NET_NSH=m | 310 | CONFIG_NET_NSH=m |
311 | CONFIG_NET_L3_MASTER_DEV=y | ||
312 | CONFIG_AF_KCM=m | 311 | CONFIG_AF_KCM=m |
313 | # CONFIG_WIRELESS is not set | 312 | # CONFIG_WIRELESS is not set |
314 | CONFIG_PSAMPLE=m | 313 | CONFIG_PSAMPLE=m |
@@ -401,6 +400,7 @@ CONFIG_ATARILANCE=y | |||
401 | # CONFIG_NET_VENDOR_MARVELL is not set | 400 | # CONFIG_NET_VENDOR_MARVELL is not set |
402 | # CONFIG_NET_VENDOR_MICREL is not set | 401 | # CONFIG_NET_VENDOR_MICREL is not set |
403 | # CONFIG_NET_VENDOR_NETRONOME is not set | 402 | # CONFIG_NET_VENDOR_NETRONOME is not set |
403 | # CONFIG_NET_VENDOR_NI is not set | ||
404 | CONFIG_NE2000=y | 404 | CONFIG_NE2000=y |
405 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 405 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
406 | # CONFIG_NET_VENDOR_RENESAS is not set | 406 | # CONFIG_NET_VENDOR_RENESAS is not set |
@@ -461,6 +461,7 @@ CONFIG_RTC_CLASS=y | |||
461 | CONFIG_RTC_DRV_GENERIC=m | 461 | CONFIG_RTC_DRV_GENERIC=m |
462 | # CONFIG_VIRTIO_MENU is not set | 462 | # CONFIG_VIRTIO_MENU is not set |
463 | # CONFIG_IOMMU_SUPPORT is not set | 463 | # CONFIG_IOMMU_SUPPORT is not set |
464 | CONFIG_DAX=m | ||
464 | CONFIG_HEARTBEAT=y | 465 | CONFIG_HEARTBEAT=y |
465 | CONFIG_PROC_HARDWARE=y | 466 | CONFIG_PROC_HARDWARE=y |
466 | CONFIG_NATFEAT=y | 467 | CONFIG_NATFEAT=y |
@@ -602,6 +603,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
602 | CONFIG_CRYPTO_MCRYPTD=m | 603 | CONFIG_CRYPTO_MCRYPTD=m |
603 | CONFIG_CRYPTO_TEST=m | 604 | CONFIG_CRYPTO_TEST=m |
604 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 605 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
606 | CONFIG_CRYPTO_CFB=m | ||
605 | CONFIG_CRYPTO_LRW=m | 607 | CONFIG_CRYPTO_LRW=m |
606 | CONFIG_CRYPTO_PCBC=m | 608 | CONFIG_CRYPTO_PCBC=m |
607 | CONFIG_CRYPTO_KEYWRAP=m | 609 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -628,6 +630,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
628 | CONFIG_CRYPTO_SALSA20=m | 630 | CONFIG_CRYPTO_SALSA20=m |
629 | CONFIG_CRYPTO_SEED=m | 631 | CONFIG_CRYPTO_SEED=m |
630 | CONFIG_CRYPTO_SERPENT=m | 632 | CONFIG_CRYPTO_SERPENT=m |
633 | CONFIG_CRYPTO_SM4=m | ||
634 | CONFIG_CRYPTO_SPECK=m | ||
631 | CONFIG_CRYPTO_TEA=m | 635 | CONFIG_CRYPTO_TEA=m |
632 | CONFIG_CRYPTO_TWOFISH=m | 636 | CONFIG_CRYPTO_TWOFISH=m |
633 | CONFIG_CRYPTO_LZO=m | 637 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 6f6470fa9a50..fca9c7aa71a3 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -94,8 +94,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
94 | CONFIG_NF_CONNTRACK_SIP=m | 94 | CONFIG_NF_CONNTRACK_SIP=m |
95 | CONFIG_NF_CONNTRACK_TFTP=m | 95 | CONFIG_NF_CONNTRACK_TFTP=m |
96 | CONFIG_NF_TABLES=m | 96 | CONFIG_NF_TABLES=m |
97 | CONFIG_NF_TABLES_INET=m | 97 | CONFIG_NF_TABLES_INET=y |
98 | CONFIG_NF_TABLES_NETDEV=m | 98 | CONFIG_NF_TABLES_NETDEV=y |
99 | CONFIG_NFT_EXTHDR=m | 99 | CONFIG_NFT_EXTHDR=m |
100 | CONFIG_NFT_META=m | 100 | CONFIG_NFT_META=m |
101 | CONFIG_NFT_RT=m | 101 | CONFIG_NFT_RT=m |
@@ -200,7 +200,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
201 | CONFIG_NFT_DUP_IPV4=m | 201 | CONFIG_NFT_DUP_IPV4=m |
202 | CONFIG_NFT_FIB_IPV4=m | 202 | CONFIG_NFT_FIB_IPV4=m |
203 | CONFIG_NF_TABLES_ARP=m | 203 | CONFIG_NF_TABLES_ARP=y |
204 | CONFIG_NF_FLOW_TABLE_IPV4=m | 204 | CONFIG_NF_FLOW_TABLE_IPV4=m |
205 | CONFIG_NF_LOG_ARP=m | 205 | CONFIG_NF_LOG_ARP=m |
206 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 206 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -229,12 +229,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
229 | CONFIG_NF_CONNTRACK_IPV6=m | 229 | CONFIG_NF_CONNTRACK_IPV6=m |
230 | CONFIG_NF_SOCKET_IPV6=m | 230 | CONFIG_NF_SOCKET_IPV6=m |
231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
232 | CONFIG_NFT_DUP_IPV6=m | ||
233 | CONFIG_NFT_FIB_IPV6=m | ||
234 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
235 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 232 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
236 | CONFIG_NFT_MASQ_IPV6=m | 233 | CONFIG_NFT_MASQ_IPV6=m |
237 | CONFIG_NFT_REDIR_IPV6=m | 234 | CONFIG_NFT_REDIR_IPV6=m |
235 | CONFIG_NFT_DUP_IPV6=m | ||
236 | CONFIG_NFT_FIB_IPV6=m | ||
237 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
238 | CONFIG_IP6_NF_IPTABLES=m | 238 | CONFIG_IP6_NF_IPTABLES=m |
239 | CONFIG_IP6_NF_MATCH_AH=m | 239 | CONFIG_IP6_NF_MATCH_AH=m |
240 | CONFIG_IP6_NF_MATCH_EUI64=m | 240 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -255,7 +255,7 @@ CONFIG_IP6_NF_RAW=m | |||
255 | CONFIG_IP6_NF_NAT=m | 255 | CONFIG_IP6_NF_NAT=m |
256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
257 | CONFIG_IP6_NF_TARGET_NPT=m | 257 | CONFIG_IP6_NF_TARGET_NPT=m |
258 | CONFIG_NF_TABLES_BRIDGE=m | 258 | CONFIG_NF_TABLES_BRIDGE=y |
259 | CONFIG_NFT_BRIDGE_META=m | 259 | CONFIG_NFT_BRIDGE_META=m |
260 | CONFIG_NFT_BRIDGE_REJECT=m | 260 | CONFIG_NFT_BRIDGE_REJECT=m |
261 | CONFIG_NF_LOG_BRIDGE=m | 261 | CONFIG_NF_LOG_BRIDGE=m |
@@ -306,7 +306,6 @@ CONFIG_NET_MPLS_GSO=m | |||
306 | CONFIG_MPLS_ROUTING=m | 306 | CONFIG_MPLS_ROUTING=m |
307 | CONFIG_MPLS_IPTUNNEL=m | 307 | CONFIG_MPLS_IPTUNNEL=m |
308 | CONFIG_NET_NSH=m | 308 | CONFIG_NET_NSH=m |
309 | CONFIG_NET_L3_MASTER_DEV=y | ||
310 | CONFIG_AF_KCM=m | 309 | CONFIG_AF_KCM=m |
311 | # CONFIG_WIRELESS is not set | 310 | # CONFIG_WIRELESS is not set |
312 | CONFIG_PSAMPLE=m | 311 | CONFIG_PSAMPLE=m |
@@ -391,6 +390,7 @@ CONFIG_BVME6000_NET=y | |||
391 | # CONFIG_NET_VENDOR_MICREL is not set | 390 | # CONFIG_NET_VENDOR_MICREL is not set |
392 | # CONFIG_NET_VENDOR_NATSEMI is not set | 391 | # CONFIG_NET_VENDOR_NATSEMI is not set |
393 | # CONFIG_NET_VENDOR_NETRONOME is not set | 392 | # CONFIG_NET_VENDOR_NETRONOME is not set |
393 | # CONFIG_NET_VENDOR_NI is not set | ||
394 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 394 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
395 | # CONFIG_NET_VENDOR_RENESAS is not set | 395 | # CONFIG_NET_VENDOR_RENESAS is not set |
396 | # CONFIG_NET_VENDOR_ROCKER is not set | 396 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -439,6 +439,7 @@ CONFIG_RTC_CLASS=y | |||
439 | CONFIG_RTC_DRV_GENERIC=m | 439 | CONFIG_RTC_DRV_GENERIC=m |
440 | # CONFIG_VIRTIO_MENU is not set | 440 | # CONFIG_VIRTIO_MENU is not set |
441 | # CONFIG_IOMMU_SUPPORT is not set | 441 | # CONFIG_IOMMU_SUPPORT is not set |
442 | CONFIG_DAX=m | ||
442 | CONFIG_PROC_HARDWARE=y | 443 | CONFIG_PROC_HARDWARE=y |
443 | CONFIG_EXT4_FS=y | 444 | CONFIG_EXT4_FS=y |
444 | CONFIG_REISERFS_FS=m | 445 | CONFIG_REISERFS_FS=m |
@@ -572,6 +573,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
572 | CONFIG_CRYPTO_MCRYPTD=m | 573 | CONFIG_CRYPTO_MCRYPTD=m |
573 | CONFIG_CRYPTO_TEST=m | 574 | CONFIG_CRYPTO_TEST=m |
574 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 575 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
576 | CONFIG_CRYPTO_CFB=m | ||
575 | CONFIG_CRYPTO_LRW=m | 577 | CONFIG_CRYPTO_LRW=m |
576 | CONFIG_CRYPTO_PCBC=m | 578 | CONFIG_CRYPTO_PCBC=m |
577 | CONFIG_CRYPTO_KEYWRAP=m | 579 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -598,6 +600,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
598 | CONFIG_CRYPTO_SALSA20=m | 600 | CONFIG_CRYPTO_SALSA20=m |
599 | CONFIG_CRYPTO_SEED=m | 601 | CONFIG_CRYPTO_SEED=m |
600 | CONFIG_CRYPTO_SERPENT=m | 602 | CONFIG_CRYPTO_SERPENT=m |
603 | CONFIG_CRYPTO_SM4=m | ||
604 | CONFIG_CRYPTO_SPECK=m | ||
601 | CONFIG_CRYPTO_TEA=m | 605 | CONFIG_CRYPTO_TEA=m |
602 | CONFIG_CRYPTO_TWOFISH=m | 606 | CONFIG_CRYPTO_TWOFISH=m |
603 | CONFIG_CRYPTO_LZO=m | 607 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 31a1a2b5e860..f9eab174915c 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -96,8 +96,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
96 | CONFIG_NF_CONNTRACK_SIP=m | 96 | CONFIG_NF_CONNTRACK_SIP=m |
97 | CONFIG_NF_CONNTRACK_TFTP=m | 97 | CONFIG_NF_CONNTRACK_TFTP=m |
98 | CONFIG_NF_TABLES=m | 98 | CONFIG_NF_TABLES=m |
99 | CONFIG_NF_TABLES_INET=m | 99 | CONFIG_NF_TABLES_INET=y |
100 | CONFIG_NF_TABLES_NETDEV=m | 100 | CONFIG_NF_TABLES_NETDEV=y |
101 | CONFIG_NFT_EXTHDR=m | 101 | CONFIG_NFT_EXTHDR=m |
102 | CONFIG_NFT_META=m | 102 | CONFIG_NFT_META=m |
103 | CONFIG_NFT_RT=m | 103 | CONFIG_NFT_RT=m |
@@ -202,7 +202,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 202 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
203 | CONFIG_NFT_DUP_IPV4=m | 203 | CONFIG_NFT_DUP_IPV4=m |
204 | CONFIG_NFT_FIB_IPV4=m | 204 | CONFIG_NFT_FIB_IPV4=m |
205 | CONFIG_NF_TABLES_ARP=m | 205 | CONFIG_NF_TABLES_ARP=y |
206 | CONFIG_NF_FLOW_TABLE_IPV4=m | 206 | CONFIG_NF_FLOW_TABLE_IPV4=m |
207 | CONFIG_NF_LOG_ARP=m | 207 | CONFIG_NF_LOG_ARP=m |
208 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 208 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -231,12 +231,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
231 | CONFIG_NF_CONNTRACK_IPV6=m | 231 | CONFIG_NF_CONNTRACK_IPV6=m |
232 | CONFIG_NF_SOCKET_IPV6=m | 232 | CONFIG_NF_SOCKET_IPV6=m |
233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 233 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
234 | CONFIG_NFT_DUP_IPV6=m | ||
235 | CONFIG_NFT_FIB_IPV6=m | ||
236 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
237 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 234 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
238 | CONFIG_NFT_MASQ_IPV6=m | 235 | CONFIG_NFT_MASQ_IPV6=m |
239 | CONFIG_NFT_REDIR_IPV6=m | 236 | CONFIG_NFT_REDIR_IPV6=m |
237 | CONFIG_NFT_DUP_IPV6=m | ||
238 | CONFIG_NFT_FIB_IPV6=m | ||
239 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
240 | CONFIG_IP6_NF_IPTABLES=m | 240 | CONFIG_IP6_NF_IPTABLES=m |
241 | CONFIG_IP6_NF_MATCH_AH=m | 241 | CONFIG_IP6_NF_MATCH_AH=m |
242 | CONFIG_IP6_NF_MATCH_EUI64=m | 242 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -257,7 +257,7 @@ CONFIG_IP6_NF_RAW=m | |||
257 | CONFIG_IP6_NF_NAT=m | 257 | CONFIG_IP6_NF_NAT=m |
258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 258 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
259 | CONFIG_IP6_NF_TARGET_NPT=m | 259 | CONFIG_IP6_NF_TARGET_NPT=m |
260 | CONFIG_NF_TABLES_BRIDGE=m | 260 | CONFIG_NF_TABLES_BRIDGE=y |
261 | CONFIG_NFT_BRIDGE_META=m | 261 | CONFIG_NFT_BRIDGE_META=m |
262 | CONFIG_NFT_BRIDGE_REJECT=m | 262 | CONFIG_NFT_BRIDGE_REJECT=m |
263 | CONFIG_NF_LOG_BRIDGE=m | 263 | CONFIG_NF_LOG_BRIDGE=m |
@@ -308,7 +308,6 @@ CONFIG_NET_MPLS_GSO=m | |||
308 | CONFIG_MPLS_ROUTING=m | 308 | CONFIG_MPLS_ROUTING=m |
309 | CONFIG_MPLS_IPTUNNEL=m | 309 | CONFIG_MPLS_IPTUNNEL=m |
310 | CONFIG_NET_NSH=m | 310 | CONFIG_NET_NSH=m |
311 | CONFIG_NET_L3_MASTER_DEV=y | ||
312 | CONFIG_AF_KCM=m | 311 | CONFIG_AF_KCM=m |
313 | # CONFIG_WIRELESS is not set | 312 | # CONFIG_WIRELESS is not set |
314 | CONFIG_PSAMPLE=m | 313 | CONFIG_PSAMPLE=m |
@@ -393,6 +392,7 @@ CONFIG_HPLANCE=y | |||
393 | # CONFIG_NET_VENDOR_MICREL is not set | 392 | # CONFIG_NET_VENDOR_MICREL is not set |
394 | # CONFIG_NET_VENDOR_NATSEMI is not set | 393 | # CONFIG_NET_VENDOR_NATSEMI is not set |
395 | # CONFIG_NET_VENDOR_NETRONOME is not set | 394 | # CONFIG_NET_VENDOR_NETRONOME is not set |
395 | # CONFIG_NET_VENDOR_NI is not set | ||
396 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 396 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
397 | # CONFIG_NET_VENDOR_RENESAS is not set | 397 | # CONFIG_NET_VENDOR_RENESAS is not set |
398 | # CONFIG_NET_VENDOR_ROCKER is not set | 398 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -449,6 +449,7 @@ CONFIG_RTC_CLASS=y | |||
449 | CONFIG_RTC_DRV_GENERIC=m | 449 | CONFIG_RTC_DRV_GENERIC=m |
450 | # CONFIG_VIRTIO_MENU is not set | 450 | # CONFIG_VIRTIO_MENU is not set |
451 | # CONFIG_IOMMU_SUPPORT is not set | 451 | # CONFIG_IOMMU_SUPPORT is not set |
452 | CONFIG_DAX=m | ||
452 | CONFIG_PROC_HARDWARE=y | 453 | CONFIG_PROC_HARDWARE=y |
453 | CONFIG_EXT4_FS=y | 454 | CONFIG_EXT4_FS=y |
454 | CONFIG_REISERFS_FS=m | 455 | CONFIG_REISERFS_FS=m |
@@ -582,6 +583,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
582 | CONFIG_CRYPTO_MCRYPTD=m | 583 | CONFIG_CRYPTO_MCRYPTD=m |
583 | CONFIG_CRYPTO_TEST=m | 584 | CONFIG_CRYPTO_TEST=m |
584 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 585 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
586 | CONFIG_CRYPTO_CFB=m | ||
585 | CONFIG_CRYPTO_LRW=m | 587 | CONFIG_CRYPTO_LRW=m |
586 | CONFIG_CRYPTO_PCBC=m | 588 | CONFIG_CRYPTO_PCBC=m |
587 | CONFIG_CRYPTO_KEYWRAP=m | 589 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -608,6 +610,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
608 | CONFIG_CRYPTO_SALSA20=m | 610 | CONFIG_CRYPTO_SALSA20=m |
609 | CONFIG_CRYPTO_SEED=m | 611 | CONFIG_CRYPTO_SEED=m |
610 | CONFIG_CRYPTO_SERPENT=m | 612 | CONFIG_CRYPTO_SERPENT=m |
613 | CONFIG_CRYPTO_SM4=m | ||
614 | CONFIG_CRYPTO_SPECK=m | ||
611 | CONFIG_CRYPTO_TEA=m | 615 | CONFIG_CRYPTO_TEA=m |
612 | CONFIG_CRYPTO_TWOFISH=m | 616 | CONFIG_CRYPTO_TWOFISH=m |
613 | CONFIG_CRYPTO_LZO=m | 617 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 390d4a87441c..b52e597899eb 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -95,8 +95,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
95 | CONFIG_NF_CONNTRACK_SIP=m | 95 | CONFIG_NF_CONNTRACK_SIP=m |
96 | CONFIG_NF_CONNTRACK_TFTP=m | 96 | CONFIG_NF_CONNTRACK_TFTP=m |
97 | CONFIG_NF_TABLES=m | 97 | CONFIG_NF_TABLES=m |
98 | CONFIG_NF_TABLES_INET=m | 98 | CONFIG_NF_TABLES_INET=y |
99 | CONFIG_NF_TABLES_NETDEV=m | 99 | CONFIG_NF_TABLES_NETDEV=y |
100 | CONFIG_NFT_EXTHDR=m | 100 | CONFIG_NFT_EXTHDR=m |
101 | CONFIG_NFT_META=m | 101 | CONFIG_NFT_META=m |
102 | CONFIG_NFT_RT=m | 102 | CONFIG_NFT_RT=m |
@@ -201,7 +201,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
201 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 201 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
202 | CONFIG_NFT_DUP_IPV4=m | 202 | CONFIG_NFT_DUP_IPV4=m |
203 | CONFIG_NFT_FIB_IPV4=m | 203 | CONFIG_NFT_FIB_IPV4=m |
204 | CONFIG_NF_TABLES_ARP=m | 204 | CONFIG_NF_TABLES_ARP=y |
205 | CONFIG_NF_FLOW_TABLE_IPV4=m | 205 | CONFIG_NF_FLOW_TABLE_IPV4=m |
206 | CONFIG_NF_LOG_ARP=m | 206 | CONFIG_NF_LOG_ARP=m |
207 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 207 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -230,12 +230,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
230 | CONFIG_NF_CONNTRACK_IPV6=m | 230 | CONFIG_NF_CONNTRACK_IPV6=m |
231 | CONFIG_NF_SOCKET_IPV6=m | 231 | CONFIG_NF_SOCKET_IPV6=m |
232 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 232 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
233 | CONFIG_NFT_DUP_IPV6=m | ||
234 | CONFIG_NFT_FIB_IPV6=m | ||
235 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
236 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 233 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
237 | CONFIG_NFT_MASQ_IPV6=m | 234 | CONFIG_NFT_MASQ_IPV6=m |
238 | CONFIG_NFT_REDIR_IPV6=m | 235 | CONFIG_NFT_REDIR_IPV6=m |
236 | CONFIG_NFT_DUP_IPV6=m | ||
237 | CONFIG_NFT_FIB_IPV6=m | ||
238 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
239 | CONFIG_IP6_NF_IPTABLES=m | 239 | CONFIG_IP6_NF_IPTABLES=m |
240 | CONFIG_IP6_NF_MATCH_AH=m | 240 | CONFIG_IP6_NF_MATCH_AH=m |
241 | CONFIG_IP6_NF_MATCH_EUI64=m | 241 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -256,7 +256,7 @@ CONFIG_IP6_NF_RAW=m | |||
256 | CONFIG_IP6_NF_NAT=m | 256 | CONFIG_IP6_NF_NAT=m |
257 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 257 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
258 | CONFIG_IP6_NF_TARGET_NPT=m | 258 | CONFIG_IP6_NF_TARGET_NPT=m |
259 | CONFIG_NF_TABLES_BRIDGE=m | 259 | CONFIG_NF_TABLES_BRIDGE=y |
260 | CONFIG_NFT_BRIDGE_META=m | 260 | CONFIG_NFT_BRIDGE_META=m |
261 | CONFIG_NFT_BRIDGE_REJECT=m | 261 | CONFIG_NFT_BRIDGE_REJECT=m |
262 | CONFIG_NF_LOG_BRIDGE=m | 262 | CONFIG_NF_LOG_BRIDGE=m |
@@ -310,7 +310,6 @@ CONFIG_NET_MPLS_GSO=m | |||
310 | CONFIG_MPLS_ROUTING=m | 310 | CONFIG_MPLS_ROUTING=m |
311 | CONFIG_MPLS_IPTUNNEL=m | 311 | CONFIG_MPLS_IPTUNNEL=m |
312 | CONFIG_NET_NSH=m | 312 | CONFIG_NET_NSH=m |
313 | CONFIG_NET_L3_MASTER_DEV=y | ||
314 | CONFIG_AF_KCM=m | 313 | CONFIG_AF_KCM=m |
315 | # CONFIG_WIRELESS is not set | 314 | # CONFIG_WIRELESS is not set |
316 | CONFIG_PSAMPLE=m | 315 | CONFIG_PSAMPLE=m |
@@ -410,6 +409,7 @@ CONFIG_MAC89x0=y | |||
410 | # CONFIG_NET_VENDOR_MICREL is not set | 409 | # CONFIG_NET_VENDOR_MICREL is not set |
411 | CONFIG_MACSONIC=y | 410 | CONFIG_MACSONIC=y |
412 | # CONFIG_NET_VENDOR_NETRONOME is not set | 411 | # CONFIG_NET_VENDOR_NETRONOME is not set |
412 | # CONFIG_NET_VENDOR_NI is not set | ||
413 | CONFIG_MAC8390=y | 413 | CONFIG_MAC8390=y |
414 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 414 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
415 | # CONFIG_NET_VENDOR_RENESAS is not set | 415 | # CONFIG_NET_VENDOR_RENESAS is not set |
@@ -471,6 +471,7 @@ CONFIG_RTC_CLASS=y | |||
471 | CONFIG_RTC_DRV_GENERIC=m | 471 | CONFIG_RTC_DRV_GENERIC=m |
472 | # CONFIG_VIRTIO_MENU is not set | 472 | # CONFIG_VIRTIO_MENU is not set |
473 | # CONFIG_IOMMU_SUPPORT is not set | 473 | # CONFIG_IOMMU_SUPPORT is not set |
474 | CONFIG_DAX=m | ||
474 | CONFIG_PROC_HARDWARE=y | 475 | CONFIG_PROC_HARDWARE=y |
475 | CONFIG_EXT4_FS=y | 476 | CONFIG_EXT4_FS=y |
476 | CONFIG_REISERFS_FS=m | 477 | CONFIG_REISERFS_FS=m |
@@ -604,6 +605,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
604 | CONFIG_CRYPTO_MCRYPTD=m | 605 | CONFIG_CRYPTO_MCRYPTD=m |
605 | CONFIG_CRYPTO_TEST=m | 606 | CONFIG_CRYPTO_TEST=m |
606 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 607 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
608 | CONFIG_CRYPTO_CFB=m | ||
607 | CONFIG_CRYPTO_LRW=m | 609 | CONFIG_CRYPTO_LRW=m |
608 | CONFIG_CRYPTO_PCBC=m | 610 | CONFIG_CRYPTO_PCBC=m |
609 | CONFIG_CRYPTO_KEYWRAP=m | 611 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -630,6 +632,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
630 | CONFIG_CRYPTO_SALSA20=m | 632 | CONFIG_CRYPTO_SALSA20=m |
631 | CONFIG_CRYPTO_SEED=m | 633 | CONFIG_CRYPTO_SEED=m |
632 | CONFIG_CRYPTO_SERPENT=m | 634 | CONFIG_CRYPTO_SERPENT=m |
635 | CONFIG_CRYPTO_SM4=m | ||
636 | CONFIG_CRYPTO_SPECK=m | ||
633 | CONFIG_CRYPTO_TEA=m | 637 | CONFIG_CRYPTO_TEA=m |
634 | CONFIG_CRYPTO_TWOFISH=m | 638 | CONFIG_CRYPTO_TWOFISH=m |
635 | CONFIG_CRYPTO_LZO=m | 639 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 77be97d82dc3..2a84eeec5b02 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -105,8 +105,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
105 | CONFIG_NF_CONNTRACK_SIP=m | 105 | CONFIG_NF_CONNTRACK_SIP=m |
106 | CONFIG_NF_CONNTRACK_TFTP=m | 106 | CONFIG_NF_CONNTRACK_TFTP=m |
107 | CONFIG_NF_TABLES=m | 107 | CONFIG_NF_TABLES=m |
108 | CONFIG_NF_TABLES_INET=m | 108 | CONFIG_NF_TABLES_INET=y |
109 | CONFIG_NF_TABLES_NETDEV=m | 109 | CONFIG_NF_TABLES_NETDEV=y |
110 | CONFIG_NFT_EXTHDR=m | 110 | CONFIG_NFT_EXTHDR=m |
111 | CONFIG_NFT_META=m | 111 | CONFIG_NFT_META=m |
112 | CONFIG_NFT_RT=m | 112 | CONFIG_NFT_RT=m |
@@ -211,7 +211,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
211 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 211 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
212 | CONFIG_NFT_DUP_IPV4=m | 212 | CONFIG_NFT_DUP_IPV4=m |
213 | CONFIG_NFT_FIB_IPV4=m | 213 | CONFIG_NFT_FIB_IPV4=m |
214 | CONFIG_NF_TABLES_ARP=m | 214 | CONFIG_NF_TABLES_ARP=y |
215 | CONFIG_NF_FLOW_TABLE_IPV4=m | 215 | CONFIG_NF_FLOW_TABLE_IPV4=m |
216 | CONFIG_NF_LOG_ARP=m | 216 | CONFIG_NF_LOG_ARP=m |
217 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 217 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -240,12 +240,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
240 | CONFIG_NF_CONNTRACK_IPV6=m | 240 | CONFIG_NF_CONNTRACK_IPV6=m |
241 | CONFIG_NF_SOCKET_IPV6=m | 241 | CONFIG_NF_SOCKET_IPV6=m |
242 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 242 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
243 | CONFIG_NFT_DUP_IPV6=m | ||
244 | CONFIG_NFT_FIB_IPV6=m | ||
245 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
246 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 243 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
247 | CONFIG_NFT_MASQ_IPV6=m | 244 | CONFIG_NFT_MASQ_IPV6=m |
248 | CONFIG_NFT_REDIR_IPV6=m | 245 | CONFIG_NFT_REDIR_IPV6=m |
246 | CONFIG_NFT_DUP_IPV6=m | ||
247 | CONFIG_NFT_FIB_IPV6=m | ||
248 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
249 | CONFIG_IP6_NF_IPTABLES=m | 249 | CONFIG_IP6_NF_IPTABLES=m |
250 | CONFIG_IP6_NF_MATCH_AH=m | 250 | CONFIG_IP6_NF_MATCH_AH=m |
251 | CONFIG_IP6_NF_MATCH_EUI64=m | 251 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -266,7 +266,7 @@ CONFIG_IP6_NF_RAW=m | |||
266 | CONFIG_IP6_NF_NAT=m | 266 | CONFIG_IP6_NF_NAT=m |
267 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 267 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
268 | CONFIG_IP6_NF_TARGET_NPT=m | 268 | CONFIG_IP6_NF_TARGET_NPT=m |
269 | CONFIG_NF_TABLES_BRIDGE=m | 269 | CONFIG_NF_TABLES_BRIDGE=y |
270 | CONFIG_NFT_BRIDGE_META=m | 270 | CONFIG_NFT_BRIDGE_META=m |
271 | CONFIG_NFT_BRIDGE_REJECT=m | 271 | CONFIG_NFT_BRIDGE_REJECT=m |
272 | CONFIG_NF_LOG_BRIDGE=m | 272 | CONFIG_NF_LOG_BRIDGE=m |
@@ -320,7 +320,6 @@ CONFIG_NET_MPLS_GSO=m | |||
320 | CONFIG_MPLS_ROUTING=m | 320 | CONFIG_MPLS_ROUTING=m |
321 | CONFIG_MPLS_IPTUNNEL=m | 321 | CONFIG_MPLS_IPTUNNEL=m |
322 | CONFIG_NET_NSH=m | 322 | CONFIG_NET_NSH=m |
323 | CONFIG_NET_L3_MASTER_DEV=y | ||
324 | CONFIG_AF_KCM=m | 323 | CONFIG_AF_KCM=m |
325 | # CONFIG_WIRELESS is not set | 324 | # CONFIG_WIRELESS is not set |
326 | CONFIG_PSAMPLE=m | 325 | CONFIG_PSAMPLE=m |
@@ -452,6 +451,7 @@ CONFIG_MVME16x_NET=y | |||
452 | # CONFIG_NET_VENDOR_MICREL is not set | 451 | # CONFIG_NET_VENDOR_MICREL is not set |
453 | CONFIG_MACSONIC=y | 452 | CONFIG_MACSONIC=y |
454 | # CONFIG_NET_VENDOR_NETRONOME is not set | 453 | # CONFIG_NET_VENDOR_NETRONOME is not set |
454 | # CONFIG_NET_VENDOR_NI is not set | ||
455 | CONFIG_HYDRA=y | 455 | CONFIG_HYDRA=y |
456 | CONFIG_MAC8390=y | 456 | CONFIG_MAC8390=y |
457 | CONFIG_NE2000=y | 457 | CONFIG_NE2000=y |
@@ -541,6 +541,7 @@ CONFIG_RTC_DRV_RP5C01=m | |||
541 | CONFIG_RTC_DRV_GENERIC=m | 541 | CONFIG_RTC_DRV_GENERIC=m |
542 | # CONFIG_VIRTIO_MENU is not set | 542 | # CONFIG_VIRTIO_MENU is not set |
543 | # CONFIG_IOMMU_SUPPORT is not set | 543 | # CONFIG_IOMMU_SUPPORT is not set |
544 | CONFIG_DAX=m | ||
544 | CONFIG_HEARTBEAT=y | 545 | CONFIG_HEARTBEAT=y |
545 | CONFIG_PROC_HARDWARE=y | 546 | CONFIG_PROC_HARDWARE=y |
546 | CONFIG_NATFEAT=y | 547 | CONFIG_NATFEAT=y |
@@ -684,6 +685,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
684 | CONFIG_CRYPTO_MCRYPTD=m | 685 | CONFIG_CRYPTO_MCRYPTD=m |
685 | CONFIG_CRYPTO_TEST=m | 686 | CONFIG_CRYPTO_TEST=m |
686 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 687 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
688 | CONFIG_CRYPTO_CFB=m | ||
687 | CONFIG_CRYPTO_LRW=m | 689 | CONFIG_CRYPTO_LRW=m |
688 | CONFIG_CRYPTO_PCBC=m | 690 | CONFIG_CRYPTO_PCBC=m |
689 | CONFIG_CRYPTO_KEYWRAP=m | 691 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -710,6 +712,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
710 | CONFIG_CRYPTO_SALSA20=m | 712 | CONFIG_CRYPTO_SALSA20=m |
711 | CONFIG_CRYPTO_SEED=m | 713 | CONFIG_CRYPTO_SEED=m |
712 | CONFIG_CRYPTO_SERPENT=m | 714 | CONFIG_CRYPTO_SERPENT=m |
715 | CONFIG_CRYPTO_SM4=m | ||
716 | CONFIG_CRYPTO_SPECK=m | ||
713 | CONFIG_CRYPTO_TEA=m | 717 | CONFIG_CRYPTO_TEA=m |
714 | CONFIG_CRYPTO_TWOFISH=m | 718 | CONFIG_CRYPTO_TWOFISH=m |
715 | CONFIG_CRYPTO_LZO=m | 719 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 2ca140757b0f..476e69994340 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -93,8 +93,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
93 | CONFIG_NF_CONNTRACK_SIP=m | 93 | CONFIG_NF_CONNTRACK_SIP=m |
94 | CONFIG_NF_CONNTRACK_TFTP=m | 94 | CONFIG_NF_CONNTRACK_TFTP=m |
95 | CONFIG_NF_TABLES=m | 95 | CONFIG_NF_TABLES=m |
96 | CONFIG_NF_TABLES_INET=m | 96 | CONFIG_NF_TABLES_INET=y |
97 | CONFIG_NF_TABLES_NETDEV=m | 97 | CONFIG_NF_TABLES_NETDEV=y |
98 | CONFIG_NFT_EXTHDR=m | 98 | CONFIG_NFT_EXTHDR=m |
99 | CONFIG_NFT_META=m | 99 | CONFIG_NFT_META=m |
100 | CONFIG_NFT_RT=m | 100 | CONFIG_NFT_RT=m |
@@ -199,7 +199,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
199 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 199 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
200 | CONFIG_NFT_DUP_IPV4=m | 200 | CONFIG_NFT_DUP_IPV4=m |
201 | CONFIG_NFT_FIB_IPV4=m | 201 | CONFIG_NFT_FIB_IPV4=m |
202 | CONFIG_NF_TABLES_ARP=m | 202 | CONFIG_NF_TABLES_ARP=y |
203 | CONFIG_NF_FLOW_TABLE_IPV4=m | 203 | CONFIG_NF_FLOW_TABLE_IPV4=m |
204 | CONFIG_NF_LOG_ARP=m | 204 | CONFIG_NF_LOG_ARP=m |
205 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 205 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -228,12 +228,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
228 | CONFIG_NF_CONNTRACK_IPV6=m | 228 | CONFIG_NF_CONNTRACK_IPV6=m |
229 | CONFIG_NF_SOCKET_IPV6=m | 229 | CONFIG_NF_SOCKET_IPV6=m |
230 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 230 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
231 | CONFIG_NFT_DUP_IPV6=m | ||
232 | CONFIG_NFT_FIB_IPV6=m | ||
233 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
234 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 231 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
235 | CONFIG_NFT_MASQ_IPV6=m | 232 | CONFIG_NFT_MASQ_IPV6=m |
236 | CONFIG_NFT_REDIR_IPV6=m | 233 | CONFIG_NFT_REDIR_IPV6=m |
234 | CONFIG_NFT_DUP_IPV6=m | ||
235 | CONFIG_NFT_FIB_IPV6=m | ||
236 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
237 | CONFIG_IP6_NF_IPTABLES=m | 237 | CONFIG_IP6_NF_IPTABLES=m |
238 | CONFIG_IP6_NF_MATCH_AH=m | 238 | CONFIG_IP6_NF_MATCH_AH=m |
239 | CONFIG_IP6_NF_MATCH_EUI64=m | 239 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -254,7 +254,7 @@ CONFIG_IP6_NF_RAW=m | |||
254 | CONFIG_IP6_NF_NAT=m | 254 | CONFIG_IP6_NF_NAT=m |
255 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 255 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
256 | CONFIG_IP6_NF_TARGET_NPT=m | 256 | CONFIG_IP6_NF_TARGET_NPT=m |
257 | CONFIG_NF_TABLES_BRIDGE=m | 257 | CONFIG_NF_TABLES_BRIDGE=y |
258 | CONFIG_NFT_BRIDGE_META=m | 258 | CONFIG_NFT_BRIDGE_META=m |
259 | CONFIG_NFT_BRIDGE_REJECT=m | 259 | CONFIG_NFT_BRIDGE_REJECT=m |
260 | CONFIG_NF_LOG_BRIDGE=m | 260 | CONFIG_NF_LOG_BRIDGE=m |
@@ -305,7 +305,6 @@ CONFIG_NET_MPLS_GSO=m | |||
305 | CONFIG_MPLS_ROUTING=m | 305 | CONFIG_MPLS_ROUTING=m |
306 | CONFIG_MPLS_IPTUNNEL=m | 306 | CONFIG_MPLS_IPTUNNEL=m |
307 | CONFIG_NET_NSH=m | 307 | CONFIG_NET_NSH=m |
308 | CONFIG_NET_L3_MASTER_DEV=y | ||
309 | CONFIG_AF_KCM=m | 308 | CONFIG_AF_KCM=m |
310 | # CONFIG_WIRELESS is not set | 309 | # CONFIG_WIRELESS is not set |
311 | CONFIG_PSAMPLE=m | 310 | CONFIG_PSAMPLE=m |
@@ -391,6 +390,7 @@ CONFIG_MVME147_NET=y | |||
391 | # CONFIG_NET_VENDOR_MICREL is not set | 390 | # CONFIG_NET_VENDOR_MICREL is not set |
392 | # CONFIG_NET_VENDOR_NATSEMI is not set | 391 | # CONFIG_NET_VENDOR_NATSEMI is not set |
393 | # CONFIG_NET_VENDOR_NETRONOME is not set | 392 | # CONFIG_NET_VENDOR_NETRONOME is not set |
393 | # CONFIG_NET_VENDOR_NI is not set | ||
394 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 394 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
395 | # CONFIG_NET_VENDOR_RENESAS is not set | 395 | # CONFIG_NET_VENDOR_RENESAS is not set |
396 | # CONFIG_NET_VENDOR_ROCKER is not set | 396 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -439,6 +439,7 @@ CONFIG_RTC_CLASS=y | |||
439 | CONFIG_RTC_DRV_GENERIC=m | 439 | CONFIG_RTC_DRV_GENERIC=m |
440 | # CONFIG_VIRTIO_MENU is not set | 440 | # CONFIG_VIRTIO_MENU is not set |
441 | # CONFIG_IOMMU_SUPPORT is not set | 441 | # CONFIG_IOMMU_SUPPORT is not set |
442 | CONFIG_DAX=m | ||
442 | CONFIG_PROC_HARDWARE=y | 443 | CONFIG_PROC_HARDWARE=y |
443 | CONFIG_EXT4_FS=y | 444 | CONFIG_EXT4_FS=y |
444 | CONFIG_REISERFS_FS=m | 445 | CONFIG_REISERFS_FS=m |
@@ -572,6 +573,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
572 | CONFIG_CRYPTO_MCRYPTD=m | 573 | CONFIG_CRYPTO_MCRYPTD=m |
573 | CONFIG_CRYPTO_TEST=m | 574 | CONFIG_CRYPTO_TEST=m |
574 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 575 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
576 | CONFIG_CRYPTO_CFB=m | ||
575 | CONFIG_CRYPTO_LRW=m | 577 | CONFIG_CRYPTO_LRW=m |
576 | CONFIG_CRYPTO_PCBC=m | 578 | CONFIG_CRYPTO_PCBC=m |
577 | CONFIG_CRYPTO_KEYWRAP=m | 579 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -598,6 +600,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
598 | CONFIG_CRYPTO_SALSA20=m | 600 | CONFIG_CRYPTO_SALSA20=m |
599 | CONFIG_CRYPTO_SEED=m | 601 | CONFIG_CRYPTO_SEED=m |
600 | CONFIG_CRYPTO_SERPENT=m | 602 | CONFIG_CRYPTO_SERPENT=m |
603 | CONFIG_CRYPTO_SM4=m | ||
604 | CONFIG_CRYPTO_SPECK=m | ||
601 | CONFIG_CRYPTO_TEA=m | 605 | CONFIG_CRYPTO_TEA=m |
602 | CONFIG_CRYPTO_TWOFISH=m | 606 | CONFIG_CRYPTO_TWOFISH=m |
603 | CONFIG_CRYPTO_LZO=m | 607 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 6a3b4dcc5aab..1477cda9146e 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -94,8 +94,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
94 | CONFIG_NF_CONNTRACK_SIP=m | 94 | CONFIG_NF_CONNTRACK_SIP=m |
95 | CONFIG_NF_CONNTRACK_TFTP=m | 95 | CONFIG_NF_CONNTRACK_TFTP=m |
96 | CONFIG_NF_TABLES=m | 96 | CONFIG_NF_TABLES=m |
97 | CONFIG_NF_TABLES_INET=m | 97 | CONFIG_NF_TABLES_INET=y |
98 | CONFIG_NF_TABLES_NETDEV=m | 98 | CONFIG_NF_TABLES_NETDEV=y |
99 | CONFIG_NFT_EXTHDR=m | 99 | CONFIG_NFT_EXTHDR=m |
100 | CONFIG_NFT_META=m | 100 | CONFIG_NFT_META=m |
101 | CONFIG_NFT_RT=m | 101 | CONFIG_NFT_RT=m |
@@ -200,7 +200,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
201 | CONFIG_NFT_DUP_IPV4=m | 201 | CONFIG_NFT_DUP_IPV4=m |
202 | CONFIG_NFT_FIB_IPV4=m | 202 | CONFIG_NFT_FIB_IPV4=m |
203 | CONFIG_NF_TABLES_ARP=m | 203 | CONFIG_NF_TABLES_ARP=y |
204 | CONFIG_NF_FLOW_TABLE_IPV4=m | 204 | CONFIG_NF_FLOW_TABLE_IPV4=m |
205 | CONFIG_NF_LOG_ARP=m | 205 | CONFIG_NF_LOG_ARP=m |
206 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 206 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -229,12 +229,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
229 | CONFIG_NF_CONNTRACK_IPV6=m | 229 | CONFIG_NF_CONNTRACK_IPV6=m |
230 | CONFIG_NF_SOCKET_IPV6=m | 230 | CONFIG_NF_SOCKET_IPV6=m |
231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
232 | CONFIG_NFT_DUP_IPV6=m | ||
233 | CONFIG_NFT_FIB_IPV6=m | ||
234 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
235 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 232 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
236 | CONFIG_NFT_MASQ_IPV6=m | 233 | CONFIG_NFT_MASQ_IPV6=m |
237 | CONFIG_NFT_REDIR_IPV6=m | 234 | CONFIG_NFT_REDIR_IPV6=m |
235 | CONFIG_NFT_DUP_IPV6=m | ||
236 | CONFIG_NFT_FIB_IPV6=m | ||
237 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
238 | CONFIG_IP6_NF_IPTABLES=m | 238 | CONFIG_IP6_NF_IPTABLES=m |
239 | CONFIG_IP6_NF_MATCH_AH=m | 239 | CONFIG_IP6_NF_MATCH_AH=m |
240 | CONFIG_IP6_NF_MATCH_EUI64=m | 240 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -255,7 +255,7 @@ CONFIG_IP6_NF_RAW=m | |||
255 | CONFIG_IP6_NF_NAT=m | 255 | CONFIG_IP6_NF_NAT=m |
256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
257 | CONFIG_IP6_NF_TARGET_NPT=m | 257 | CONFIG_IP6_NF_TARGET_NPT=m |
258 | CONFIG_NF_TABLES_BRIDGE=m | 258 | CONFIG_NF_TABLES_BRIDGE=y |
259 | CONFIG_NFT_BRIDGE_META=m | 259 | CONFIG_NFT_BRIDGE_META=m |
260 | CONFIG_NFT_BRIDGE_REJECT=m | 260 | CONFIG_NFT_BRIDGE_REJECT=m |
261 | CONFIG_NF_LOG_BRIDGE=m | 261 | CONFIG_NF_LOG_BRIDGE=m |
@@ -306,7 +306,6 @@ CONFIG_NET_MPLS_GSO=m | |||
306 | CONFIG_MPLS_ROUTING=m | 306 | CONFIG_MPLS_ROUTING=m |
307 | CONFIG_MPLS_IPTUNNEL=m | 307 | CONFIG_MPLS_IPTUNNEL=m |
308 | CONFIG_NET_NSH=m | 308 | CONFIG_NET_NSH=m |
309 | CONFIG_NET_L3_MASTER_DEV=y | ||
310 | CONFIG_AF_KCM=m | 309 | CONFIG_AF_KCM=m |
311 | # CONFIG_WIRELESS is not set | 310 | # CONFIG_WIRELESS is not set |
312 | CONFIG_PSAMPLE=m | 311 | CONFIG_PSAMPLE=m |
@@ -391,6 +390,7 @@ CONFIG_MVME16x_NET=y | |||
391 | # CONFIG_NET_VENDOR_MICREL is not set | 390 | # CONFIG_NET_VENDOR_MICREL is not set |
392 | # CONFIG_NET_VENDOR_NATSEMI is not set | 391 | # CONFIG_NET_VENDOR_NATSEMI is not set |
393 | # CONFIG_NET_VENDOR_NETRONOME is not set | 392 | # CONFIG_NET_VENDOR_NETRONOME is not set |
393 | # CONFIG_NET_VENDOR_NI is not set | ||
394 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 394 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
395 | # CONFIG_NET_VENDOR_RENESAS is not set | 395 | # CONFIG_NET_VENDOR_RENESAS is not set |
396 | # CONFIG_NET_VENDOR_ROCKER is not set | 396 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -439,6 +439,7 @@ CONFIG_RTC_CLASS=y | |||
439 | CONFIG_RTC_DRV_GENERIC=m | 439 | CONFIG_RTC_DRV_GENERIC=m |
440 | # CONFIG_VIRTIO_MENU is not set | 440 | # CONFIG_VIRTIO_MENU is not set |
441 | # CONFIG_IOMMU_SUPPORT is not set | 441 | # CONFIG_IOMMU_SUPPORT is not set |
442 | CONFIG_DAX=m | ||
442 | CONFIG_PROC_HARDWARE=y | 443 | CONFIG_PROC_HARDWARE=y |
443 | CONFIG_EXT4_FS=y | 444 | CONFIG_EXT4_FS=y |
444 | CONFIG_REISERFS_FS=m | 445 | CONFIG_REISERFS_FS=m |
@@ -572,6 +573,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
572 | CONFIG_CRYPTO_MCRYPTD=m | 573 | CONFIG_CRYPTO_MCRYPTD=m |
573 | CONFIG_CRYPTO_TEST=m | 574 | CONFIG_CRYPTO_TEST=m |
574 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 575 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
576 | CONFIG_CRYPTO_CFB=m | ||
575 | CONFIG_CRYPTO_LRW=m | 577 | CONFIG_CRYPTO_LRW=m |
576 | CONFIG_CRYPTO_PCBC=m | 578 | CONFIG_CRYPTO_PCBC=m |
577 | CONFIG_CRYPTO_KEYWRAP=m | 579 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -598,6 +600,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
598 | CONFIG_CRYPTO_SALSA20=m | 600 | CONFIG_CRYPTO_SALSA20=m |
599 | CONFIG_CRYPTO_SEED=m | 601 | CONFIG_CRYPTO_SEED=m |
600 | CONFIG_CRYPTO_SERPENT=m | 602 | CONFIG_CRYPTO_SERPENT=m |
603 | CONFIG_CRYPTO_SM4=m | ||
604 | CONFIG_CRYPTO_SPECK=m | ||
601 | CONFIG_CRYPTO_TEA=m | 605 | CONFIG_CRYPTO_TEA=m |
602 | CONFIG_CRYPTO_TWOFISH=m | 606 | CONFIG_CRYPTO_TWOFISH=m |
603 | CONFIG_CRYPTO_LZO=m | 607 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 2a3e29c97652..b3a543dc48a0 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -94,8 +94,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
94 | CONFIG_NF_CONNTRACK_SIP=m | 94 | CONFIG_NF_CONNTRACK_SIP=m |
95 | CONFIG_NF_CONNTRACK_TFTP=m | 95 | CONFIG_NF_CONNTRACK_TFTP=m |
96 | CONFIG_NF_TABLES=m | 96 | CONFIG_NF_TABLES=m |
97 | CONFIG_NF_TABLES_INET=m | 97 | CONFIG_NF_TABLES_INET=y |
98 | CONFIG_NF_TABLES_NETDEV=m | 98 | CONFIG_NF_TABLES_NETDEV=y |
99 | CONFIG_NFT_EXTHDR=m | 99 | CONFIG_NFT_EXTHDR=m |
100 | CONFIG_NFT_META=m | 100 | CONFIG_NFT_META=m |
101 | CONFIG_NFT_RT=m | 101 | CONFIG_NFT_RT=m |
@@ -200,7 +200,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 200 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
201 | CONFIG_NFT_DUP_IPV4=m | 201 | CONFIG_NFT_DUP_IPV4=m |
202 | CONFIG_NFT_FIB_IPV4=m | 202 | CONFIG_NFT_FIB_IPV4=m |
203 | CONFIG_NF_TABLES_ARP=m | 203 | CONFIG_NF_TABLES_ARP=y |
204 | CONFIG_NF_FLOW_TABLE_IPV4=m | 204 | CONFIG_NF_FLOW_TABLE_IPV4=m |
205 | CONFIG_NF_LOG_ARP=m | 205 | CONFIG_NF_LOG_ARP=m |
206 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 206 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -229,12 +229,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
229 | CONFIG_NF_CONNTRACK_IPV6=m | 229 | CONFIG_NF_CONNTRACK_IPV6=m |
230 | CONFIG_NF_SOCKET_IPV6=m | 230 | CONFIG_NF_SOCKET_IPV6=m |
231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 231 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
232 | CONFIG_NFT_DUP_IPV6=m | ||
233 | CONFIG_NFT_FIB_IPV6=m | ||
234 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
235 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 232 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
236 | CONFIG_NFT_MASQ_IPV6=m | 233 | CONFIG_NFT_MASQ_IPV6=m |
237 | CONFIG_NFT_REDIR_IPV6=m | 234 | CONFIG_NFT_REDIR_IPV6=m |
235 | CONFIG_NFT_DUP_IPV6=m | ||
236 | CONFIG_NFT_FIB_IPV6=m | ||
237 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
238 | CONFIG_IP6_NF_IPTABLES=m | 238 | CONFIG_IP6_NF_IPTABLES=m |
239 | CONFIG_IP6_NF_MATCH_AH=m | 239 | CONFIG_IP6_NF_MATCH_AH=m |
240 | CONFIG_IP6_NF_MATCH_EUI64=m | 240 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -255,7 +255,7 @@ CONFIG_IP6_NF_RAW=m | |||
255 | CONFIG_IP6_NF_NAT=m | 255 | CONFIG_IP6_NF_NAT=m |
256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 256 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
257 | CONFIG_IP6_NF_TARGET_NPT=m | 257 | CONFIG_IP6_NF_TARGET_NPT=m |
258 | CONFIG_NF_TABLES_BRIDGE=m | 258 | CONFIG_NF_TABLES_BRIDGE=y |
259 | CONFIG_NFT_BRIDGE_META=m | 259 | CONFIG_NFT_BRIDGE_META=m |
260 | CONFIG_NFT_BRIDGE_REJECT=m | 260 | CONFIG_NFT_BRIDGE_REJECT=m |
261 | CONFIG_NF_LOG_BRIDGE=m | 261 | CONFIG_NF_LOG_BRIDGE=m |
@@ -306,7 +306,6 @@ CONFIG_NET_MPLS_GSO=m | |||
306 | CONFIG_MPLS_ROUTING=m | 306 | CONFIG_MPLS_ROUTING=m |
307 | CONFIG_MPLS_IPTUNNEL=m | 307 | CONFIG_MPLS_IPTUNNEL=m |
308 | CONFIG_NET_NSH=m | 308 | CONFIG_NET_NSH=m |
309 | CONFIG_NET_L3_MASTER_DEV=y | ||
310 | CONFIG_AF_KCM=m | 309 | CONFIG_AF_KCM=m |
311 | # CONFIG_WIRELESS is not set | 310 | # CONFIG_WIRELESS is not set |
312 | CONFIG_PSAMPLE=m | 311 | CONFIG_PSAMPLE=m |
@@ -400,6 +399,7 @@ CONFIG_VETH=m | |||
400 | # CONFIG_NET_VENDOR_MARVELL is not set | 399 | # CONFIG_NET_VENDOR_MARVELL is not set |
401 | # CONFIG_NET_VENDOR_MICREL is not set | 400 | # CONFIG_NET_VENDOR_MICREL is not set |
402 | # CONFIG_NET_VENDOR_NETRONOME is not set | 401 | # CONFIG_NET_VENDOR_NETRONOME is not set |
402 | # CONFIG_NET_VENDOR_NI is not set | ||
403 | CONFIG_NE2000=y | 403 | CONFIG_NE2000=y |
404 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 404 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
405 | # CONFIG_NET_VENDOR_RENESAS is not set | 405 | # CONFIG_NET_VENDOR_RENESAS is not set |
@@ -461,6 +461,7 @@ CONFIG_RTC_CLASS=y | |||
461 | CONFIG_RTC_DRV_GENERIC=m | 461 | CONFIG_RTC_DRV_GENERIC=m |
462 | # CONFIG_VIRTIO_MENU is not set | 462 | # CONFIG_VIRTIO_MENU is not set |
463 | # CONFIG_IOMMU_SUPPORT is not set | 463 | # CONFIG_IOMMU_SUPPORT is not set |
464 | CONFIG_DAX=m | ||
464 | CONFIG_HEARTBEAT=y | 465 | CONFIG_HEARTBEAT=y |
465 | CONFIG_PROC_HARDWARE=y | 466 | CONFIG_PROC_HARDWARE=y |
466 | CONFIG_EXT4_FS=y | 467 | CONFIG_EXT4_FS=y |
@@ -595,6 +596,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
595 | CONFIG_CRYPTO_MCRYPTD=m | 596 | CONFIG_CRYPTO_MCRYPTD=m |
596 | CONFIG_CRYPTO_TEST=m | 597 | CONFIG_CRYPTO_TEST=m |
597 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 598 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
599 | CONFIG_CRYPTO_CFB=m | ||
598 | CONFIG_CRYPTO_LRW=m | 600 | CONFIG_CRYPTO_LRW=m |
599 | CONFIG_CRYPTO_PCBC=m | 601 | CONFIG_CRYPTO_PCBC=m |
600 | CONFIG_CRYPTO_KEYWRAP=m | 602 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -621,6 +623,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
621 | CONFIG_CRYPTO_SALSA20=m | 623 | CONFIG_CRYPTO_SALSA20=m |
622 | CONFIG_CRYPTO_SEED=m | 624 | CONFIG_CRYPTO_SEED=m |
623 | CONFIG_CRYPTO_SERPENT=m | 625 | CONFIG_CRYPTO_SERPENT=m |
626 | CONFIG_CRYPTO_SM4=m | ||
627 | CONFIG_CRYPTO_SPECK=m | ||
624 | CONFIG_CRYPTO_TEA=m | 628 | CONFIG_CRYPTO_TEA=m |
625 | CONFIG_CRYPTO_TWOFISH=m | 629 | CONFIG_CRYPTO_TWOFISH=m |
626 | CONFIG_CRYPTO_LZO=m | 630 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index cba2494c99b2..d543ed5dfa96 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -91,8 +91,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
91 | CONFIG_NF_CONNTRACK_SIP=m | 91 | CONFIG_NF_CONNTRACK_SIP=m |
92 | CONFIG_NF_CONNTRACK_TFTP=m | 92 | CONFIG_NF_CONNTRACK_TFTP=m |
93 | CONFIG_NF_TABLES=m | 93 | CONFIG_NF_TABLES=m |
94 | CONFIG_NF_TABLES_INET=m | 94 | CONFIG_NF_TABLES_INET=y |
95 | CONFIG_NF_TABLES_NETDEV=m | 95 | CONFIG_NF_TABLES_NETDEV=y |
96 | CONFIG_NFT_EXTHDR=m | 96 | CONFIG_NFT_EXTHDR=m |
97 | CONFIG_NFT_META=m | 97 | CONFIG_NFT_META=m |
98 | CONFIG_NFT_RT=m | 98 | CONFIG_NFT_RT=m |
@@ -197,7 +197,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
197 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 197 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
198 | CONFIG_NFT_DUP_IPV4=m | 198 | CONFIG_NFT_DUP_IPV4=m |
199 | CONFIG_NFT_FIB_IPV4=m | 199 | CONFIG_NFT_FIB_IPV4=m |
200 | CONFIG_NF_TABLES_ARP=m | 200 | CONFIG_NF_TABLES_ARP=y |
201 | CONFIG_NF_FLOW_TABLE_IPV4=m | 201 | CONFIG_NF_FLOW_TABLE_IPV4=m |
202 | CONFIG_NF_LOG_ARP=m | 202 | CONFIG_NF_LOG_ARP=m |
203 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 203 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -226,12 +226,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
226 | CONFIG_NF_CONNTRACK_IPV6=m | 226 | CONFIG_NF_CONNTRACK_IPV6=m |
227 | CONFIG_NF_SOCKET_IPV6=m | 227 | CONFIG_NF_SOCKET_IPV6=m |
228 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 228 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
229 | CONFIG_NFT_DUP_IPV6=m | ||
230 | CONFIG_NFT_FIB_IPV6=m | ||
231 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
232 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 229 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
233 | CONFIG_NFT_MASQ_IPV6=m | 230 | CONFIG_NFT_MASQ_IPV6=m |
234 | CONFIG_NFT_REDIR_IPV6=m | 231 | CONFIG_NFT_REDIR_IPV6=m |
232 | CONFIG_NFT_DUP_IPV6=m | ||
233 | CONFIG_NFT_FIB_IPV6=m | ||
234 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
235 | CONFIG_IP6_NF_IPTABLES=m | 235 | CONFIG_IP6_NF_IPTABLES=m |
236 | CONFIG_IP6_NF_MATCH_AH=m | 236 | CONFIG_IP6_NF_MATCH_AH=m |
237 | CONFIG_IP6_NF_MATCH_EUI64=m | 237 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -252,7 +252,7 @@ CONFIG_IP6_NF_RAW=m | |||
252 | CONFIG_IP6_NF_NAT=m | 252 | CONFIG_IP6_NF_NAT=m |
253 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 253 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
254 | CONFIG_IP6_NF_TARGET_NPT=m | 254 | CONFIG_IP6_NF_TARGET_NPT=m |
255 | CONFIG_NF_TABLES_BRIDGE=m | 255 | CONFIG_NF_TABLES_BRIDGE=y |
256 | CONFIG_NFT_BRIDGE_META=m | 256 | CONFIG_NFT_BRIDGE_META=m |
257 | CONFIG_NFT_BRIDGE_REJECT=m | 257 | CONFIG_NFT_BRIDGE_REJECT=m |
258 | CONFIG_NF_LOG_BRIDGE=m | 258 | CONFIG_NF_LOG_BRIDGE=m |
@@ -303,7 +303,6 @@ CONFIG_NET_MPLS_GSO=m | |||
303 | CONFIG_MPLS_ROUTING=m | 303 | CONFIG_MPLS_ROUTING=m |
304 | CONFIG_MPLS_IPTUNNEL=m | 304 | CONFIG_MPLS_IPTUNNEL=m |
305 | CONFIG_NET_NSH=m | 305 | CONFIG_NET_NSH=m |
306 | CONFIG_NET_L3_MASTER_DEV=y | ||
307 | CONFIG_AF_KCM=m | 306 | CONFIG_AF_KCM=m |
308 | # CONFIG_WIRELESS is not set | 307 | # CONFIG_WIRELESS is not set |
309 | CONFIG_PSAMPLE=m | 308 | CONFIG_PSAMPLE=m |
@@ -388,6 +387,7 @@ CONFIG_SUN3_82586=y | |||
388 | # CONFIG_NET_VENDOR_MICREL is not set | 387 | # CONFIG_NET_VENDOR_MICREL is not set |
389 | # CONFIG_NET_VENDOR_NATSEMI is not set | 388 | # CONFIG_NET_VENDOR_NATSEMI is not set |
390 | # CONFIG_NET_VENDOR_NETRONOME is not set | 389 | # CONFIG_NET_VENDOR_NETRONOME is not set |
390 | # CONFIG_NET_VENDOR_NI is not set | ||
391 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 391 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
392 | # CONFIG_NET_VENDOR_RENESAS is not set | 392 | # CONFIG_NET_VENDOR_RENESAS is not set |
393 | # CONFIG_NET_VENDOR_ROCKER is not set | 393 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -441,6 +441,7 @@ CONFIG_RTC_CLASS=y | |||
441 | CONFIG_RTC_DRV_GENERIC=m | 441 | CONFIG_RTC_DRV_GENERIC=m |
442 | # CONFIG_VIRTIO_MENU is not set | 442 | # CONFIG_VIRTIO_MENU is not set |
443 | # CONFIG_IOMMU_SUPPORT is not set | 443 | # CONFIG_IOMMU_SUPPORT is not set |
444 | CONFIG_DAX=m | ||
444 | CONFIG_PROC_HARDWARE=y | 445 | CONFIG_PROC_HARDWARE=y |
445 | CONFIG_EXT4_FS=y | 446 | CONFIG_EXT4_FS=y |
446 | CONFIG_REISERFS_FS=m | 447 | CONFIG_REISERFS_FS=m |
@@ -573,6 +574,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
573 | CONFIG_CRYPTO_MCRYPTD=m | 574 | CONFIG_CRYPTO_MCRYPTD=m |
574 | CONFIG_CRYPTO_TEST=m | 575 | CONFIG_CRYPTO_TEST=m |
575 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 576 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
577 | CONFIG_CRYPTO_CFB=m | ||
576 | CONFIG_CRYPTO_LRW=m | 578 | CONFIG_CRYPTO_LRW=m |
577 | CONFIG_CRYPTO_PCBC=m | 579 | CONFIG_CRYPTO_PCBC=m |
578 | CONFIG_CRYPTO_KEYWRAP=m | 580 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -599,6 +601,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
599 | CONFIG_CRYPTO_SALSA20=m | 601 | CONFIG_CRYPTO_SALSA20=m |
600 | CONFIG_CRYPTO_SEED=m | 602 | CONFIG_CRYPTO_SEED=m |
601 | CONFIG_CRYPTO_SERPENT=m | 603 | CONFIG_CRYPTO_SERPENT=m |
604 | CONFIG_CRYPTO_SM4=m | ||
605 | CONFIG_CRYPTO_SPECK=m | ||
602 | CONFIG_CRYPTO_TEA=m | 606 | CONFIG_CRYPTO_TEA=m |
603 | CONFIG_CRYPTO_TWOFISH=m | 607 | CONFIG_CRYPTO_TWOFISH=m |
604 | CONFIG_CRYPTO_LZO=m | 608 | CONFIG_CRYPTO_LZO=m |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index d911561137fd..a67e54246023 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -91,8 +91,8 @@ CONFIG_NF_CONNTRACK_SANE=m | |||
91 | CONFIG_NF_CONNTRACK_SIP=m | 91 | CONFIG_NF_CONNTRACK_SIP=m |
92 | CONFIG_NF_CONNTRACK_TFTP=m | 92 | CONFIG_NF_CONNTRACK_TFTP=m |
93 | CONFIG_NF_TABLES=m | 93 | CONFIG_NF_TABLES=m |
94 | CONFIG_NF_TABLES_INET=m | 94 | CONFIG_NF_TABLES_INET=y |
95 | CONFIG_NF_TABLES_NETDEV=m | 95 | CONFIG_NF_TABLES_NETDEV=y |
96 | CONFIG_NFT_EXTHDR=m | 96 | CONFIG_NFT_EXTHDR=m |
97 | CONFIG_NFT_META=m | 97 | CONFIG_NFT_META=m |
98 | CONFIG_NFT_RT=m | 98 | CONFIG_NFT_RT=m |
@@ -197,7 +197,7 @@ CONFIG_NF_SOCKET_IPV4=m | |||
197 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m | 197 | CONFIG_NFT_CHAIN_ROUTE_IPV4=m |
198 | CONFIG_NFT_DUP_IPV4=m | 198 | CONFIG_NFT_DUP_IPV4=m |
199 | CONFIG_NFT_FIB_IPV4=m | 199 | CONFIG_NFT_FIB_IPV4=m |
200 | CONFIG_NF_TABLES_ARP=m | 200 | CONFIG_NF_TABLES_ARP=y |
201 | CONFIG_NF_FLOW_TABLE_IPV4=m | 201 | CONFIG_NF_FLOW_TABLE_IPV4=m |
202 | CONFIG_NF_LOG_ARP=m | 202 | CONFIG_NF_LOG_ARP=m |
203 | CONFIG_NFT_CHAIN_NAT_IPV4=m | 203 | CONFIG_NFT_CHAIN_NAT_IPV4=m |
@@ -226,12 +226,12 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
226 | CONFIG_NF_CONNTRACK_IPV6=m | 226 | CONFIG_NF_CONNTRACK_IPV6=m |
227 | CONFIG_NF_SOCKET_IPV6=m | 227 | CONFIG_NF_SOCKET_IPV6=m |
228 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m | 228 | CONFIG_NFT_CHAIN_ROUTE_IPV6=m |
229 | CONFIG_NFT_DUP_IPV6=m | ||
230 | CONFIG_NFT_FIB_IPV6=m | ||
231 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
232 | CONFIG_NFT_CHAIN_NAT_IPV6=m | 229 | CONFIG_NFT_CHAIN_NAT_IPV6=m |
233 | CONFIG_NFT_MASQ_IPV6=m | 230 | CONFIG_NFT_MASQ_IPV6=m |
234 | CONFIG_NFT_REDIR_IPV6=m | 231 | CONFIG_NFT_REDIR_IPV6=m |
232 | CONFIG_NFT_DUP_IPV6=m | ||
233 | CONFIG_NFT_FIB_IPV6=m | ||
234 | CONFIG_NF_FLOW_TABLE_IPV6=m | ||
235 | CONFIG_IP6_NF_IPTABLES=m | 235 | CONFIG_IP6_NF_IPTABLES=m |
236 | CONFIG_IP6_NF_MATCH_AH=m | 236 | CONFIG_IP6_NF_MATCH_AH=m |
237 | CONFIG_IP6_NF_MATCH_EUI64=m | 237 | CONFIG_IP6_NF_MATCH_EUI64=m |
@@ -252,7 +252,7 @@ CONFIG_IP6_NF_RAW=m | |||
252 | CONFIG_IP6_NF_NAT=m | 252 | CONFIG_IP6_NF_NAT=m |
253 | CONFIG_IP6_NF_TARGET_MASQUERADE=m | 253 | CONFIG_IP6_NF_TARGET_MASQUERADE=m |
254 | CONFIG_IP6_NF_TARGET_NPT=m | 254 | CONFIG_IP6_NF_TARGET_NPT=m |
255 | CONFIG_NF_TABLES_BRIDGE=m | 255 | CONFIG_NF_TABLES_BRIDGE=y |
256 | CONFIG_NFT_BRIDGE_META=m | 256 | CONFIG_NFT_BRIDGE_META=m |
257 | CONFIG_NFT_BRIDGE_REJECT=m | 257 | CONFIG_NFT_BRIDGE_REJECT=m |
258 | CONFIG_NF_LOG_BRIDGE=m | 258 | CONFIG_NF_LOG_BRIDGE=m |
@@ -303,7 +303,6 @@ CONFIG_NET_MPLS_GSO=m | |||
303 | CONFIG_MPLS_ROUTING=m | 303 | CONFIG_MPLS_ROUTING=m |
304 | CONFIG_MPLS_IPTUNNEL=m | 304 | CONFIG_MPLS_IPTUNNEL=m |
305 | CONFIG_NET_NSH=m | 305 | CONFIG_NET_NSH=m |
306 | CONFIG_NET_L3_MASTER_DEV=y | ||
307 | CONFIG_AF_KCM=m | 306 | CONFIG_AF_KCM=m |
308 | # CONFIG_WIRELESS is not set | 307 | # CONFIG_WIRELESS is not set |
309 | CONFIG_PSAMPLE=m | 308 | CONFIG_PSAMPLE=m |
@@ -389,6 +388,7 @@ CONFIG_SUN3LANCE=y | |||
389 | # CONFIG_NET_VENDOR_MICREL is not set | 388 | # CONFIG_NET_VENDOR_MICREL is not set |
390 | # CONFIG_NET_VENDOR_NATSEMI is not set | 389 | # CONFIG_NET_VENDOR_NATSEMI is not set |
391 | # CONFIG_NET_VENDOR_NETRONOME is not set | 390 | # CONFIG_NET_VENDOR_NETRONOME is not set |
391 | # CONFIG_NET_VENDOR_NI is not set | ||
392 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 392 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
393 | # CONFIG_NET_VENDOR_RENESAS is not set | 393 | # CONFIG_NET_VENDOR_RENESAS is not set |
394 | # CONFIG_NET_VENDOR_ROCKER is not set | 394 | # CONFIG_NET_VENDOR_ROCKER is not set |
@@ -441,6 +441,7 @@ CONFIG_RTC_CLASS=y | |||
441 | CONFIG_RTC_DRV_GENERIC=m | 441 | CONFIG_RTC_DRV_GENERIC=m |
442 | # CONFIG_VIRTIO_MENU is not set | 442 | # CONFIG_VIRTIO_MENU is not set |
443 | # CONFIG_IOMMU_SUPPORT is not set | 443 | # CONFIG_IOMMU_SUPPORT is not set |
444 | CONFIG_DAX=m | ||
444 | CONFIG_PROC_HARDWARE=y | 445 | CONFIG_PROC_HARDWARE=y |
445 | CONFIG_EXT4_FS=y | 446 | CONFIG_EXT4_FS=y |
446 | CONFIG_REISERFS_FS=m | 447 | CONFIG_REISERFS_FS=m |
@@ -574,6 +575,7 @@ CONFIG_CRYPTO_CRYPTD=m | |||
574 | CONFIG_CRYPTO_MCRYPTD=m | 575 | CONFIG_CRYPTO_MCRYPTD=m |
575 | CONFIG_CRYPTO_TEST=m | 576 | CONFIG_CRYPTO_TEST=m |
576 | CONFIG_CRYPTO_CHACHA20POLY1305=m | 577 | CONFIG_CRYPTO_CHACHA20POLY1305=m |
578 | CONFIG_CRYPTO_CFB=m | ||
577 | CONFIG_CRYPTO_LRW=m | 579 | CONFIG_CRYPTO_LRW=m |
578 | CONFIG_CRYPTO_PCBC=m | 580 | CONFIG_CRYPTO_PCBC=m |
579 | CONFIG_CRYPTO_KEYWRAP=m | 581 | CONFIG_CRYPTO_KEYWRAP=m |
@@ -600,6 +602,8 @@ CONFIG_CRYPTO_KHAZAD=m | |||
600 | CONFIG_CRYPTO_SALSA20=m | 602 | CONFIG_CRYPTO_SALSA20=m |
601 | CONFIG_CRYPTO_SEED=m | 603 | CONFIG_CRYPTO_SEED=m |
602 | CONFIG_CRYPTO_SERPENT=m | 604 | CONFIG_CRYPTO_SERPENT=m |
605 | CONFIG_CRYPTO_SM4=m | ||
606 | CONFIG_CRYPTO_SPECK=m | ||
603 | CONFIG_CRYPTO_TEA=m | 607 | CONFIG_CRYPTO_TEA=m |
604 | CONFIG_CRYPTO_TWOFISH=m | 608 | CONFIG_CRYPTO_TWOFISH=m |
605 | CONFIG_CRYPTO_LZO=m | 609 | CONFIG_CRYPTO_LZO=m |