Commit ee55c9c5 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v5.17-rc3 



  - Drop CONFIG_NFT_COUNTER=m (removed in commit 023223df
    ("netfilter: nf_tables: make counter support built-in")),
  - Drop CONFIG_NF_FLOW_TABLE_IPV4=m and CONFIG_NF_FLOW_TABLE_IPV6=m
    (can no longer be enabled since commit c42ba429 ("netfilter:
    flowtable: remove ipv4/ipv6 modules")),
  - Enable the new option for legacy fbcon hardware acceleration code on
    all platforms that have a frame buffer device that can make use of
    it,
  - Drop CONFIG_TEST_HASH=m (replaced by auto-modular
    CONFIG_HASH_KUNIT_TEST in commit 0acc968f ("test_hash.c:
    refactor into kunit")),
  - Enable modular build of the new siphash selftest.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20220123125543.2658445-1-geert@linux-m68k.org
Link: https://lore.kernel.org/r/20220207131008.2202977-1-geert@linux-m68k.org
parent c4d5b6ee

arch/m68k/configs/amiga_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -204,7 +203,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -229,7 +227,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -435,6 +432,7 @@ CONFIG_FB_AMIGA_ECS=y 
CONFIG_FB_AMIGA_AGA=y

CONFIG_FB_FM2=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y

CONFIG_LOGO=y

CONFIG_SOUND=m

CONFIG_DMASOUND_PAULA=m
@@ -643,7 +641,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/apollo_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -200,7 +199,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -225,7 +223,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -393,6 +390,7 @@ CONFIG_PTP_1588_CLOCK=m 
# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set
@@ -599,7 +597,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/atari_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -207,7 +206,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -232,7 +230,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -621,7 +618,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/bvme6000_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -197,7 +196,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -222,7 +220,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -592,7 +589,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

arch/m68k/configs/hp300_defconfig

+2 −4
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ CONFIG_NF_TABLES_NETDEV=y 
CONFIG_NFT_NUMGEN=m

CONFIG_NFT_CT=m

CONFIG_NFT_FLOW_OFFLOAD=m

CONFIG_NFT_COUNTER=m

CONFIG_NFT_CONNLIMIT=m

CONFIG_NFT_LOG=m

CONFIG_NFT_LIMIT=m
@@ -199,7 +198,6 @@ CONFIG_IP_SET_LIST_SET=m 
CONFIG_NFT_DUP_IPV4=m

CONFIG_NFT_FIB_IPV4=m

CONFIG_NF_TABLES_ARP=y

CONFIG_NF_FLOW_TABLE_IPV4=m

CONFIG_NF_LOG_ARP=m

CONFIG_NF_LOG_IPV4=m

CONFIG_IP_NF_IPTABLES=m
@@ -224,7 +222,6 @@ CONFIG_IP_NF_ARPFILTER=m 
CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m

CONFIG_NFT_FIB_IPV6=m

CONFIG_NF_FLOW_TABLE_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_AH=m

CONFIG_IP6_NF_MATCH_EUI64=m
@@ -395,6 +392,7 @@ CONFIG_PTP_1588_CLOCK=m 
# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -601,7 +599,7 @@ CONFIG_TEST_UUID=m 
CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m