Skip to content

Commit ec8c826

Browse files
geertugeertu
committed
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 4654467 ("netfilter: arptables: allow xtables-nft only builds")), - Drop CONFIG_STRING_SELFTEST=m (replaced by auto-modular CONFIG_STRING_KUNIT_TEST in commit 29d8568 ("string: Convert selftest to KUnit")), - Drop CONFIG_TEST_STRING_HELPERS=m (replaced by auto-modular CONFIG_STRING_HELPERS_KUNIT_TEST in commit fb57550 ("string: Convert helpers selftest to KUnit")). Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/e17b3ac60832a3ff92d25d1a05bf814e8f15d0c5.1711475325.git.geert@linux-m68k.org
1 parent c66b7b9 commit ec8c826

12 files changed

+12
-36
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
2626
CONFIG_SERIAL_CONSOLE=y
2727
CONFIG_MODULES=y
2828
CONFIG_MODULE_UNLOAD=y
29+
CONFIG_TRIM_UNUSED_KSYMS=y
2930
CONFIG_PARTITION_ADVANCED=y
3031
CONFIG_ATARI_PARTITION=y
3132
CONFIG_MAC_PARTITION=y
@@ -217,7 +218,6 @@ CONFIG_IP_NF_MANGLE=m
217218
CONFIG_IP_NF_TARGET_ECN=m
218219
CONFIG_IP_NF_TARGET_TTL=m
219220
CONFIG_IP_NF_RAW=m
220-
CONFIG_IP_NF_ARPTABLES=m
221221
CONFIG_IP_NF_ARPFILTER=m
222222
CONFIG_IP_NF_ARP_MANGLE=m
223223
CONFIG_NFT_DUP_IPV6=m
@@ -624,8 +624,6 @@ CONFIG_REED_SOLOMON_TEST=m
624624
CONFIG_ATOMIC64_SELFTEST=m
625625
CONFIG_ASYNC_RAID6_TEST=m
626626
CONFIG_TEST_HEXDUMP=m
627-
CONFIG_STRING_SELFTEST=m
628-
CONFIG_TEST_STRING_HELPERS=m
629627
CONFIG_TEST_KSTRTOX=m
630628
CONFIG_TEST_PRINTF=m
631629
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ CONFIG_HEARTBEAT=y
2121
CONFIG_PROC_HARDWARE=y
2222
CONFIG_MODULES=y
2323
CONFIG_MODULE_UNLOAD=y
24+
CONFIG_TRIM_UNUSED_KSYMS=y
2425
CONFIG_PARTITION_ADVANCED=y
2526
CONFIG_AMIGA_PARTITION=y
2627
CONFIG_ATARI_PARTITION=y
@@ -213,7 +214,6 @@ CONFIG_IP_NF_MANGLE=m
213214
CONFIG_IP_NF_TARGET_ECN=m
214215
CONFIG_IP_NF_TARGET_TTL=m
215216
CONFIG_IP_NF_RAW=m
216-
CONFIG_IP_NF_ARPTABLES=m
217217
CONFIG_IP_NF_ARPFILTER=m
218218
CONFIG_IP_NF_ARP_MANGLE=m
219219
CONFIG_NFT_DUP_IPV6=m
@@ -581,8 +581,6 @@ CONFIG_REED_SOLOMON_TEST=m
581581
CONFIG_ATOMIC64_SELFTEST=m
582582
CONFIG_ASYNC_RAID6_TEST=m
583583
CONFIG_TEST_HEXDUMP=m
584-
CONFIG_STRING_SELFTEST=m
585-
CONFIG_TEST_STRING_HELPERS=m
586584
CONFIG_TEST_KSTRTOX=m
587585
CONFIG_TEST_PRINTF=m
588586
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_ATARI_ETHERNEC=y
2929
CONFIG_ATARI_DSP56K=m
3030
CONFIG_MODULES=y
3131
CONFIG_MODULE_UNLOAD=y
32+
CONFIG_TRIM_UNUSED_KSYMS=y
3233
CONFIG_PARTITION_ADVANCED=y
3334
CONFIG_AMIGA_PARTITION=y
3435
CONFIG_MAC_PARTITION=y
@@ -220,7 +221,6 @@ CONFIG_IP_NF_MANGLE=m
220221
CONFIG_IP_NF_TARGET_ECN=m
221222
CONFIG_IP_NF_TARGET_TTL=m
222223
CONFIG_IP_NF_RAW=m
223-
CONFIG_IP_NF_ARPTABLES=m
224224
CONFIG_IP_NF_ARPFILTER=m
225225
CONFIG_IP_NF_ARP_MANGLE=m
226226
CONFIG_NFT_DUP_IPV6=m
@@ -601,8 +601,6 @@ CONFIG_REED_SOLOMON_TEST=m
601601
CONFIG_ATOMIC64_SELFTEST=m
602602
CONFIG_ASYNC_RAID6_TEST=m
603603
CONFIG_TEST_HEXDUMP=m
604-
CONFIG_STRING_SELFTEST=m
605-
CONFIG_TEST_STRING_HELPERS=m
606604
CONFIG_TEST_KSTRTOX=m
607605
CONFIG_TEST_PRINTF=m
608606
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CONFIG_BVME6000=y
1919
CONFIG_PROC_HARDWARE=y
2020
CONFIG_MODULES=y
2121
CONFIG_MODULE_UNLOAD=y
22+
CONFIG_TRIM_UNUSED_KSYMS=y
2223
CONFIG_PARTITION_ADVANCED=y
2324
CONFIG_AMIGA_PARTITION=y
2425
CONFIG_ATARI_PARTITION=y
@@ -210,7 +211,6 @@ CONFIG_IP_NF_MANGLE=m
210211
CONFIG_IP_NF_TARGET_ECN=m
211212
CONFIG_IP_NF_TARGET_TTL=m
212213
CONFIG_IP_NF_RAW=m
213-
CONFIG_IP_NF_ARPTABLES=m
214214
CONFIG_IP_NF_ARPFILTER=m
215215
CONFIG_IP_NF_ARP_MANGLE=m
216216
CONFIG_NFT_DUP_IPV6=m
@@ -573,8 +573,6 @@ CONFIG_REED_SOLOMON_TEST=m
573573
CONFIG_ATOMIC64_SELFTEST=m
574574
CONFIG_ASYNC_RAID6_TEST=m
575575
CONFIG_TEST_HEXDUMP=m
576-
CONFIG_STRING_SELFTEST=m
577-
CONFIG_TEST_STRING_HELPERS=m
578576
CONFIG_TEST_KSTRTOX=m
579577
CONFIG_TEST_PRINTF=m
580578
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_HP300=y
2020
CONFIG_PROC_HARDWARE=y
2121
CONFIG_MODULES=y
2222
CONFIG_MODULE_UNLOAD=y
23+
CONFIG_TRIM_UNUSED_KSYMS=y
2324
CONFIG_PARTITION_ADVANCED=y
2425
CONFIG_AMIGA_PARTITION=y
2526
CONFIG_ATARI_PARTITION=y
@@ -212,7 +213,6 @@ CONFIG_IP_NF_MANGLE=m
212213
CONFIG_IP_NF_TARGET_ECN=m
213214
CONFIG_IP_NF_TARGET_TTL=m
214215
CONFIG_IP_NF_RAW=m
215-
CONFIG_IP_NF_ARPTABLES=m
216216
CONFIG_IP_NF_ARPFILTER=m
217217
CONFIG_IP_NF_ARP_MANGLE=m
218218
CONFIG_NFT_DUP_IPV6=m
@@ -583,8 +583,6 @@ CONFIG_REED_SOLOMON_TEST=m
583583
CONFIG_ATOMIC64_SELFTEST=m
584584
CONFIG_ASYNC_RAID6_TEST=m
585585
CONFIG_TEST_HEXDUMP=m
586-
CONFIG_STRING_SELFTEST=m
587-
CONFIG_TEST_STRING_HELPERS=m
588586
CONFIG_TEST_KSTRTOX=m
589587
CONFIG_TEST_PRINTF=m
590588
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_MAC=y
2020
CONFIG_PROC_HARDWARE=y
2121
CONFIG_MODULES=y
2222
CONFIG_MODULE_UNLOAD=y
23+
CONFIG_TRIM_UNUSED_KSYMS=y
2324
CONFIG_PARTITION_ADVANCED=y
2425
CONFIG_AMIGA_PARTITION=y
2526
CONFIG_ATARI_PARTITION=y
@@ -211,7 +212,6 @@ CONFIG_IP_NF_MANGLE=m
211212
CONFIG_IP_NF_TARGET_ECN=m
212213
CONFIG_IP_NF_TARGET_TTL=m
213214
CONFIG_IP_NF_RAW=m
214-
CONFIG_IP_NF_ARPTABLES=m
215215
CONFIG_IP_NF_ARPFILTER=m
216216
CONFIG_IP_NF_ARP_MANGLE=m
217217
CONFIG_NFT_DUP_IPV6=m
@@ -600,8 +600,6 @@ CONFIG_REED_SOLOMON_TEST=m
600600
CONFIG_ATOMIC64_SELFTEST=m
601601
CONFIG_ASYNC_RAID6_TEST=m
602602
CONFIG_TEST_HEXDUMP=m
603-
CONFIG_STRING_SELFTEST=m
604-
CONFIG_TEST_STRING_HELPERS=m
605603
CONFIG_TEST_KSTRTOX=m
606604
CONFIG_TEST_PRINTF=m
607605
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
4444
CONFIG_SERIAL_CONSOLE=y
4545
CONFIG_MODULES=y
4646
CONFIG_MODULE_UNLOAD=y
47+
CONFIG_TRIM_UNUSED_KSYMS=y
4748
CONFIG_PARTITION_ADVANCED=y
4849
CONFIG_BSD_DISKLABEL=y
4950
CONFIG_MINIX_SUBPARTITION=y
@@ -231,7 +232,6 @@ CONFIG_IP_NF_MANGLE=m
231232
CONFIG_IP_NF_TARGET_ECN=m
232233
CONFIG_IP_NF_TARGET_TTL=m
233234
CONFIG_IP_NF_RAW=m
234-
CONFIG_IP_NF_ARPTABLES=m
235235
CONFIG_IP_NF_ARPFILTER=m
236236
CONFIG_IP_NF_ARP_MANGLE=m
237237
CONFIG_NFT_DUP_IPV6=m
@@ -686,8 +686,6 @@ CONFIG_REED_SOLOMON_TEST=m
686686
CONFIG_ATOMIC64_SELFTEST=m
687687
CONFIG_ASYNC_RAID6_TEST=m
688688
CONFIG_TEST_HEXDUMP=m
689-
CONFIG_STRING_SELFTEST=m
690-
CONFIG_TEST_STRING_HELPERS=m
691689
CONFIG_TEST_KSTRTOX=m
692690
CONFIG_TEST_PRINTF=m
693691
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CONFIG_MVME147=y
1818
CONFIG_PROC_HARDWARE=y
1919
CONFIG_MODULES=y
2020
CONFIG_MODULE_UNLOAD=y
21+
CONFIG_TRIM_UNUSED_KSYMS=y
2122
CONFIG_PARTITION_ADVANCED=y
2223
CONFIG_AMIGA_PARTITION=y
2324
CONFIG_ATARI_PARTITION=y
@@ -209,7 +210,6 @@ CONFIG_IP_NF_MANGLE=m
209210
CONFIG_IP_NF_TARGET_ECN=m
210211
CONFIG_IP_NF_TARGET_TTL=m
211212
CONFIG_IP_NF_RAW=m
212-
CONFIG_IP_NF_ARPTABLES=m
213213
CONFIG_IP_NF_ARPFILTER=m
214214
CONFIG_IP_NF_ARP_MANGLE=m
215215
CONFIG_NFT_DUP_IPV6=m
@@ -572,8 +572,6 @@ CONFIG_REED_SOLOMON_TEST=m
572572
CONFIG_ATOMIC64_SELFTEST=m
573573
CONFIG_ASYNC_RAID6_TEST=m
574574
CONFIG_TEST_HEXDUMP=m
575-
CONFIG_STRING_SELFTEST=m
576-
CONFIG_TEST_STRING_HELPERS=m
577575
CONFIG_TEST_KSTRTOX=m
578576
CONFIG_TEST_PRINTF=m
579577
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CONFIG_MVME16x=y
1919
CONFIG_PROC_HARDWARE=y
2020
CONFIG_MODULES=y
2121
CONFIG_MODULE_UNLOAD=y
22+
CONFIG_TRIM_UNUSED_KSYMS=y
2223
CONFIG_PARTITION_ADVANCED=y
2324
CONFIG_AMIGA_PARTITION=y
2425
CONFIG_ATARI_PARTITION=y
@@ -210,7 +211,6 @@ CONFIG_IP_NF_MANGLE=m
210211
CONFIG_IP_NF_TARGET_ECN=m
211212
CONFIG_IP_NF_TARGET_TTL=m
212213
CONFIG_IP_NF_RAW=m
213-
CONFIG_IP_NF_ARPTABLES=m
214214
CONFIG_IP_NF_ARPFILTER=m
215215
CONFIG_IP_NF_ARP_MANGLE=m
216216
CONFIG_NFT_DUP_IPV6=m
@@ -573,8 +573,6 @@ CONFIG_REED_SOLOMON_TEST=m
573573
CONFIG_ATOMIC64_SELFTEST=m
574574
CONFIG_ASYNC_RAID6_TEST=m
575575
CONFIG_TEST_HEXDUMP=m
576-
CONFIG_STRING_SELFTEST=m
577-
CONFIG_TEST_STRING_HELPERS=m
578576
CONFIG_TEST_KSTRTOX=m
579577
CONFIG_TEST_PRINTF=m
580578
CONFIG_TEST_SCANF=m

‎arch/m68k/configs/q40_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ CONFIG_HEARTBEAT=y
1919
CONFIG_PROC_HARDWARE=y
2020
CONFIG_MODULES=y
2121
CONFIG_MODULE_UNLOAD=y
22+
CONFIG_TRIM_UNUSED_KSYMS=y
2223
CONFIG_PARTITION_ADVANCED=y
2324
CONFIG_AMIGA_PARTITION=y
2425
CONFIG_ATARI_PARTITION=y
@@ -211,7 +212,6 @@ CONFIG_IP_NF_MANGLE=m
211212
CONFIG_IP_NF_TARGET_ECN=m
212213
CONFIG_IP_NF_TARGET_TTL=m
213214
CONFIG_IP_NF_RAW=m
214-
CONFIG_IP_NF_ARPTABLES=m
215215
CONFIG_IP_NF_ARPFILTER=m
216216
CONFIG_IP_NF_ARP_MANGLE=m
217217
CONFIG_NFT_DUP_IPV6=m
@@ -590,8 +590,6 @@ CONFIG_REED_SOLOMON_TEST=m
590590
CONFIG_ATOMIC64_SELFTEST=m
591591
CONFIG_ASYNC_RAID6_TEST=m
592592
CONFIG_TEST_HEXDUMP=m
593-
CONFIG_STRING_SELFTEST=m
594-
CONFIG_TEST_STRING_HELPERS=m
595593
CONFIG_TEST_KSTRTOX=m
596594
CONFIG_TEST_PRINTF=m
597595
CONFIG_TEST_SCANF=m

0 commit comments

Comments
 (0)