Commit 695f2c0c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v6.17-rc1 



  - Enable Netfilter legacy tables support,
  - Drop CONFIG_IP_NF_FILTER=m, CONFIG_IP_NF_MANGLE=m,
    CONFIG_IP6_NF_FILTER=m, and CONFIG_IP6_NF_MANGLE=m (auto-modular
    since commit 9fce6658 ("netfilter: Exclude LEGACY TABLES on
    PREEMPT_RT.")),
  - Enable legacy EBTABLES support (no longer auto-selected since commit
    9fce6658 ("netfilter: Exclude LEGACY TABLES on
    PREEMPT_RT.")),
  - Drop CONFIG_CDROM_PKTCDVD=m (removed in commit 1cea5180
    ("block: remove pktcdvd driver")),
  - Move CONFIG_CRC_BENCHMARK=y (moved in commit 89a51591
    ("lib/crc: Move files into lib/crc/")).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://patch.msgid.link/012bc96a01eef989b39eedbe84591bd50c022e57.1754904412.git.geert@linux-m68k.org
parent 6d567409

arch/m68k/configs/amiga_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ CONFIG_NFT_FIB_NETDEV=m 
CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XTABLES_LEGACY=y

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -206,14 +207,12 @@ CONFIG_IP_NF_MATCH_AH=m 
CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -233,10 +232,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m 
CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -245,6 +242,7 @@ CONFIG_NF_TABLES_BRIDGE=m 
CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -309,7 +307,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m
@@ -605,6 +602,7 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC_BENCHMARK=y

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -636,7 +634,6 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/apollo_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ CONFIG_NFT_FIB_NETDEV=m 
CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XTABLES_LEGACY=y

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -202,14 +203,12 @@ CONFIG_IP_NF_MATCH_AH=m 
CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -229,10 +228,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m 
CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -241,6 +238,7 @@ CONFIG_NF_TABLES_BRIDGE=m 
CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -299,7 +297,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m
@@ -562,6 +559,7 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC_BENCHMARK=y

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -593,7 +591,6 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/atari_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ CONFIG_NFT_FIB_NETDEV=m 
CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XTABLES_LEGACY=y

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -209,14 +210,12 @@ CONFIG_IP_NF_MATCH_AH=m 
CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -236,10 +235,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m 
CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -248,6 +245,7 @@ CONFIG_NF_TABLES_BRIDGE=m 
CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -310,7 +308,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m
@@ -582,6 +579,7 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC_BENCHMARK=y

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -613,7 +611,6 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/bvme6000_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ CONFIG_NFT_FIB_NETDEV=m 
CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XTABLES_LEGACY=y

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -199,14 +200,12 @@ CONFIG_IP_NF_MATCH_AH=m 
CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -226,10 +225,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m 
CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -238,6 +235,7 @@ CONFIG_NF_TABLES_BRIDGE=m 
CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -296,7 +294,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m
@@ -554,6 +551,7 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC_BENCHMARK=y

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -585,7 +583,6 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

arch/m68k/configs/hp300_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ CONFIG_NFT_FIB_NETDEV=m 
CONFIG_NFT_REJECT_NETDEV=m

CONFIG_NF_FLOW_TABLE_INET=m

CONFIG_NF_FLOW_TABLE=m

CONFIG_NETFILTER_XTABLES_LEGACY=y

CONFIG_NETFILTER_XT_SET=m

CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -201,14 +202,12 @@ CONFIG_IP_NF_MATCH_AH=m 
CONFIG_IP_NF_MATCH_ECN=m

CONFIG_IP_NF_MATCH_RPFILTER=m

CONFIG_IP_NF_MATCH_TTL=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_SYNPROXY=m

CONFIG_IP_NF_NAT=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_TARGET_NETMAP=m

CONFIG_IP_NF_TARGET_REDIRECT=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m
@@ -228,10 +227,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m 
CONFIG_IP6_NF_MATCH_RT=m

CONFIG_IP6_NF_MATCH_SRH=m

CONFIG_IP6_NF_TARGET_HL=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_TARGET_SYNPROXY=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -240,6 +237,7 @@ CONFIG_NF_TABLES_BRIDGE=m 
CONFIG_NFT_BRIDGE_META=m

CONFIG_NFT_BRIDGE_REJECT=m

CONFIG_NF_CONNTRACK_BRIDGE=m

CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -298,7 +296,6 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_CDROM_PKTCDVD=m

CONFIG_ATA_OVER_ETH=m

CONFIG_DUMMY_IRQ=m

CONFIG_RAID_ATTRS=m
@@ -564,6 +561,7 @@ CONFIG_CRYPTO_USER_API_RNG=m 
CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC_BENCHMARK=y

CONFIG_XZ_DEC_TEST=m

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -595,7 +593,6 @@ CONFIG_FIND_BIT_BENCHMARK=m 
CONFIG_TEST_FIRMWARE=m

CONFIG_TEST_SYSCTL=m

CONFIG_LINEAR_RANGES_TEST=m

CONFIG_CRC_BENCHMARK=y

CONFIG_TEST_UDELAY=m

CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m