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

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



  - Enable trimming of unused exported kernel symbols,
  - Drop CONFIG_IP_NF_ARPTABLES=m (auto-enabled since commit
    4654467d ("netfilter: arptables: allow xtables-nft only
    builds")),
  - Drop CONFIG_STRING_SELFTEST=m (replaced by auto-modular
    CONFIG_STRING_KUNIT_TEST in commit 29d85688 ("string:
    Convert selftest to KUnit")),
  - Drop CONFIG_TEST_STRING_HELPERS=m (replaced by auto-modular
    CONFIG_STRING_HELPERS_KUNIT_TEST in commit fb57550f
    ("string: Convert helpers selftest to KUnit")).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/e17b3ac60832a3ff92d25d1a05bf814e8f15d0c5.1711475325.git.geert@linux-m68k.org
parent c66b7b95

arch/m68k/configs/amiga_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y 
CONFIG_SERIAL_CONSOLE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ATARI_PARTITION=y

CONFIG_MAC_PARTITION=y
@@ -217,7 +218,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -624,8 +624,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/apollo_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ CONFIG_HEARTBEAT=y 
CONFIG_PROC_HARDWARE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y
@@ -213,7 +214,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -581,8 +581,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/atari_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ CONFIG_ATARI_ETHERNEC=y 
CONFIG_ATARI_DSP56K=m

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_MAC_PARTITION=y
@@ -220,7 +221,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -601,8 +601,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/bvme6000_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CONFIG_BVME6000=y 
CONFIG_PROC_HARDWARE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y
@@ -210,7 +211,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -573,8 +573,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m

arch/m68k/configs/hp300_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ CONFIG_HP300=y 
CONFIG_PROC_HARDWARE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_AMIGA_PARTITION=y

CONFIG_ATARI_PARTITION=y
@@ -212,7 +213,6 @@ CONFIG_IP_NF_MANGLE=m 
CONFIG_IP_NF_TARGET_ECN=m

CONFIG_IP_NF_TARGET_TTL=m

CONFIG_IP_NF_RAW=m

CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m

CONFIG_NFT_DUP_IPV6=m
@@ -583,8 +583,6 @@ CONFIG_REED_SOLOMON_TEST=m 
CONFIG_ATOMIC64_SELFTEST=m

CONFIG_ASYNC_RAID6_TEST=m

CONFIG_TEST_HEXDUMP=m

CONFIG_STRING_SELFTEST=m

CONFIG_TEST_STRING_HELPERS=m

CONFIG_TEST_KSTRTOX=m

CONFIG_TEST_PRINTF=m

CONFIG_TEST_SCANF=m