Skip to content

Commit ee55c9c

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v5.17-rc3
 - Drop CONFIG_NFT_COUNTER=m (removed in commit 023223d ("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 c42ba42 ("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 0acc968 ("test_hash.c: refactor into kunit")), - Enable modular build of the new siphash selftest. Signed-off-by: Geert 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
1 parent c4d5b6e commit ee55c9c

12 files changed

Lines changed: 16 additions & 48 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ CONFIG_NF_TABLES_NETDEV=y
104104
CONFIG_NFT_NUMGEN=m
105105
CONFIG_NFT_CT=m
106106
CONFIG_NFT_FLOW_OFFLOAD=m
107-
CONFIG_NFT_COUNTER=m
108107
CONFIG_NFT_CONNLIMIT=m
109108
CONFIG_NFT_LOG=m
110109
CONFIG_NFT_LIMIT=m
@@ -204,7 +203,6 @@ CONFIG_IP_SET_LIST_SET=m
204203
CONFIG_NFT_DUP_IPV4=m
205204
CONFIG_NFT_FIB_IPV4=m
206205
CONFIG_NF_TABLES_ARP=y
207-
CONFIG_NF_FLOW_TABLE_IPV4=m
208206
CONFIG_NF_LOG_ARP=m
209207
CONFIG_NF_LOG_IPV4=m
210208
CONFIG_IP_NF_IPTABLES=m
@@ -229,7 +227,6 @@ CONFIG_IP_NF_ARPFILTER=m
229227
CONFIG_IP_NF_ARP_MANGLE=m
230228
CONFIG_NFT_DUP_IPV6=m
231229
CONFIG_NFT_FIB_IPV6=m
232-
CONFIG_NF_FLOW_TABLE_IPV6=m
233230
CONFIG_IP6_NF_IPTABLES=m
234231
CONFIG_IP6_NF_MATCH_AH=m
235232
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -435,6 +432,7 @@ CONFIG_FB_AMIGA_ECS=y
435432
CONFIG_FB_AMIGA_AGA=y
436433
CONFIG_FB_FM2=y
437434
CONFIG_FRAMEBUFFER_CONSOLE=y
435+
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
438436
CONFIG_LOGO=y
439437
CONFIG_SOUND=m
440438
CONFIG_DMASOUND_PAULA=m
@@ -643,7 +641,7 @@ CONFIG_TEST_UUID=m
643641
CONFIG_TEST_XARRAY=m
644642
CONFIG_TEST_OVERFLOW=m
645643
CONFIG_TEST_RHASHTABLE=m
646-
CONFIG_TEST_HASH=m
644+
CONFIG_TEST_SIPHASH=m
647645
CONFIG_TEST_IDA=m
648646
CONFIG_TEST_BITOPS=m
649647
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_NF_TABLES_NETDEV=y
100100
CONFIG_NFT_NUMGEN=m
101101
CONFIG_NFT_CT=m
102102
CONFIG_NFT_FLOW_OFFLOAD=m
103-
CONFIG_NFT_COUNTER=m
104103
CONFIG_NFT_CONNLIMIT=m
105104
CONFIG_NFT_LOG=m
106105
CONFIG_NFT_LIMIT=m
@@ -200,7 +199,6 @@ CONFIG_IP_SET_LIST_SET=m
200199
CONFIG_NFT_DUP_IPV4=m
201200
CONFIG_NFT_FIB_IPV4=m
202201
CONFIG_NF_TABLES_ARP=y
203-
CONFIG_NF_FLOW_TABLE_IPV4=m
204202
CONFIG_NF_LOG_ARP=m
205203
CONFIG_NF_LOG_IPV4=m
206204
CONFIG_IP_NF_IPTABLES=m
@@ -225,7 +223,6 @@ CONFIG_IP_NF_ARPFILTER=m
225223
CONFIG_IP_NF_ARP_MANGLE=m
226224
CONFIG_NFT_DUP_IPV6=m
227225
CONFIG_NFT_FIB_IPV6=m
228-
CONFIG_NF_FLOW_TABLE_IPV6=m
229226
CONFIG_IP6_NF_IPTABLES=m
230227
CONFIG_IP6_NF_MATCH_AH=m
231228
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -393,6 +390,7 @@ CONFIG_PTP_1588_CLOCK=m
393390
# CONFIG_HWMON is not set
394391
CONFIG_FB=y
395392
CONFIG_FRAMEBUFFER_CONSOLE=y
393+
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
396394
CONFIG_LOGO=y
397395
# CONFIG_LOGO_LINUX_VGA16 is not set
398396
# CONFIG_LOGO_LINUX_CLUT224 is not set
@@ -599,7 +597,7 @@ CONFIG_TEST_UUID=m
599597
CONFIG_TEST_XARRAY=m
600598
CONFIG_TEST_OVERFLOW=m
601599
CONFIG_TEST_RHASHTABLE=m
602-
CONFIG_TEST_HASH=m
600+
CONFIG_TEST_SIPHASH=m
603601
CONFIG_TEST_IDA=m
604602
CONFIG_TEST_BITOPS=m
605603
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ CONFIG_NF_TABLES_NETDEV=y
107107
CONFIG_NFT_NUMGEN=m
108108
CONFIG_NFT_CT=m
109109
CONFIG_NFT_FLOW_OFFLOAD=m
110-
CONFIG_NFT_COUNTER=m
111110
CONFIG_NFT_CONNLIMIT=m
112111
CONFIG_NFT_LOG=m
113112
CONFIG_NFT_LIMIT=m
@@ -207,7 +206,6 @@ CONFIG_IP_SET_LIST_SET=m
207206
CONFIG_NFT_DUP_IPV4=m
208207
CONFIG_NFT_FIB_IPV4=m
209208
CONFIG_NF_TABLES_ARP=y
210-
CONFIG_NF_FLOW_TABLE_IPV4=m
211209
CONFIG_NF_LOG_ARP=m
212210
CONFIG_NF_LOG_IPV4=m
213211
CONFIG_IP_NF_IPTABLES=m
@@ -232,7 +230,6 @@ CONFIG_IP_NF_ARPFILTER=m
232230
CONFIG_IP_NF_ARP_MANGLE=m
233231
CONFIG_NFT_DUP_IPV6=m
234232
CONFIG_NFT_FIB_IPV6=m
235-
CONFIG_NF_FLOW_TABLE_IPV6=m
236233
CONFIG_IP6_NF_IPTABLES=m
237234
CONFIG_IP6_NF_MATCH_AH=m
238235
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -621,7 +618,7 @@ CONFIG_TEST_UUID=m
621618
CONFIG_TEST_XARRAY=m
622619
CONFIG_TEST_OVERFLOW=m
623620
CONFIG_TEST_RHASHTABLE=m
624-
CONFIG_TEST_HASH=m
621+
CONFIG_TEST_SIPHASH=m
625622
CONFIG_TEST_IDA=m
626623
CONFIG_TEST_BITOPS=m
627624
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ CONFIG_NF_TABLES_NETDEV=y
9797
CONFIG_NFT_NUMGEN=m
9898
CONFIG_NFT_CT=m
9999
CONFIG_NFT_FLOW_OFFLOAD=m
100-
CONFIG_NFT_COUNTER=m
101100
CONFIG_NFT_CONNLIMIT=m
102101
CONFIG_NFT_LOG=m
103102
CONFIG_NFT_LIMIT=m
@@ -197,7 +196,6 @@ CONFIG_IP_SET_LIST_SET=m
197196
CONFIG_NFT_DUP_IPV4=m
198197
CONFIG_NFT_FIB_IPV4=m
199198
CONFIG_NF_TABLES_ARP=y
200-
CONFIG_NF_FLOW_TABLE_IPV4=m
201199
CONFIG_NF_LOG_ARP=m
202200
CONFIG_NF_LOG_IPV4=m
203201
CONFIG_IP_NF_IPTABLES=m
@@ -222,7 +220,6 @@ CONFIG_IP_NF_ARPFILTER=m
222220
CONFIG_IP_NF_ARP_MANGLE=m
223221
CONFIG_NFT_DUP_IPV6=m
224222
CONFIG_NFT_FIB_IPV6=m
225-
CONFIG_NF_FLOW_TABLE_IPV6=m
226223
CONFIG_IP6_NF_IPTABLES=m
227224
CONFIG_IP6_NF_MATCH_AH=m
228225
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -592,7 +589,7 @@ CONFIG_TEST_UUID=m
592589
CONFIG_TEST_XARRAY=m
593590
CONFIG_TEST_OVERFLOW=m
594591
CONFIG_TEST_RHASHTABLE=m
595-
CONFIG_TEST_HASH=m
592+
CONFIG_TEST_SIPHASH=m
596593
CONFIG_TEST_IDA=m
597594
CONFIG_TEST_BITOPS=m
598595
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ CONFIG_NF_TABLES_NETDEV=y
9999
CONFIG_NFT_NUMGEN=m
100100
CONFIG_NFT_CT=m
101101
CONFIG_NFT_FLOW_OFFLOAD=m
102-
CONFIG_NFT_COUNTER=m
103102
CONFIG_NFT_CONNLIMIT=m
104103
CONFIG_NFT_LOG=m
105104
CONFIG_NFT_LIMIT=m
@@ -199,7 +198,6 @@ CONFIG_IP_SET_LIST_SET=m
199198
CONFIG_NFT_DUP_IPV4=m
200199
CONFIG_NFT_FIB_IPV4=m
201200
CONFIG_NF_TABLES_ARP=y
202-
CONFIG_NF_FLOW_TABLE_IPV4=m
203201
CONFIG_NF_LOG_ARP=m
204202
CONFIG_NF_LOG_IPV4=m
205203
CONFIG_IP_NF_IPTABLES=m
@@ -224,7 +222,6 @@ CONFIG_IP_NF_ARPFILTER=m
224222
CONFIG_IP_NF_ARP_MANGLE=m
225223
CONFIG_NFT_DUP_IPV6=m
226224
CONFIG_NFT_FIB_IPV6=m
227-
CONFIG_NF_FLOW_TABLE_IPV6=m
228225
CONFIG_IP6_NF_IPTABLES=m
229226
CONFIG_IP6_NF_MATCH_AH=m
230227
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -395,6 +392,7 @@ CONFIG_PTP_1588_CLOCK=m
395392
# CONFIG_HWMON is not set
396393
CONFIG_FB=y
397394
CONFIG_FRAMEBUFFER_CONSOLE=y
395+
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
398396
CONFIG_LOGO=y
399397
# CONFIG_LOGO_LINUX_MONO is not set
400398
# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -601,7 +599,7 @@ CONFIG_TEST_UUID=m
601599
CONFIG_TEST_XARRAY=m
602600
CONFIG_TEST_OVERFLOW=m
603601
CONFIG_TEST_RHASHTABLE=m
604-
CONFIG_TEST_HASH=m
602+
CONFIG_TEST_SIPHASH=m
605603
CONFIG_TEST_IDA=m
606604
CONFIG_TEST_BITOPS=m
607605
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ CONFIG_NF_TABLES_NETDEV=y
9898
CONFIG_NFT_NUMGEN=m
9999
CONFIG_NFT_CT=m
100100
CONFIG_NFT_FLOW_OFFLOAD=m
101-
CONFIG_NFT_COUNTER=m
102101
CONFIG_NFT_CONNLIMIT=m
103102
CONFIG_NFT_LOG=m
104103
CONFIG_NFT_LIMIT=m
@@ -198,7 +197,6 @@ CONFIG_IP_SET_LIST_SET=m
198197
CONFIG_NFT_DUP_IPV4=m
199198
CONFIG_NFT_FIB_IPV4=m
200199
CONFIG_NF_TABLES_ARP=y
201-
CONFIG_NF_FLOW_TABLE_IPV4=m
202200
CONFIG_NF_LOG_ARP=m
203201
CONFIG_NF_LOG_IPV4=m
204202
CONFIG_IP_NF_IPTABLES=m
@@ -223,7 +221,6 @@ CONFIG_IP_NF_ARPFILTER=m
223221
CONFIG_IP_NF_ARP_MANGLE=m
224222
CONFIG_NFT_DUP_IPV6=m
225223
CONFIG_NFT_FIB_IPV6=m
226-
CONFIG_NF_FLOW_TABLE_IPV6=m
227224
CONFIG_IP6_NF_IPTABLES=m
228225
CONFIG_IP6_NF_MATCH_AH=m
229226
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -623,7 +620,7 @@ CONFIG_TEST_UUID=m
623620
CONFIG_TEST_XARRAY=m
624621
CONFIG_TEST_OVERFLOW=m
625622
CONFIG_TEST_RHASHTABLE=m
626-
CONFIG_TEST_HASH=m
623+
CONFIG_TEST_SIPHASH=m
627624
CONFIG_TEST_IDA=m
628625
CONFIG_TEST_BITOPS=m
629626
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ CONFIG_NF_TABLES_NETDEV=y
118118
CONFIG_NFT_NUMGEN=m
119119
CONFIG_NFT_CT=m
120120
CONFIG_NFT_FLOW_OFFLOAD=m
121-
CONFIG_NFT_COUNTER=m
122121
CONFIG_NFT_CONNLIMIT=m
123122
CONFIG_NFT_LOG=m
124123
CONFIG_NFT_LIMIT=m
@@ -218,7 +217,6 @@ CONFIG_IP_SET_LIST_SET=m
218217
CONFIG_NFT_DUP_IPV4=m
219218
CONFIG_NFT_FIB_IPV4=m
220219
CONFIG_NF_TABLES_ARP=y
221-
CONFIG_NF_FLOW_TABLE_IPV4=m
222220
CONFIG_NF_LOG_ARP=m
223221
CONFIG_NF_LOG_IPV4=m
224222
CONFIG_IP_NF_IPTABLES=m
@@ -243,7 +241,6 @@ CONFIG_IP_NF_ARPFILTER=m
243241
CONFIG_IP_NF_ARP_MANGLE=m
244242
CONFIG_NFT_DUP_IPV6=m
245243
CONFIG_NFT_FIB_IPV6=m
246-
CONFIG_NF_FLOW_TABLE_IPV6=m
247244
CONFIG_IP6_NF_IPTABLES=m
248245
CONFIG_IP6_NF_MATCH_AH=m
249246
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -497,6 +494,7 @@ CONFIG_FB_ATARI=y
497494
CONFIG_FB_VALKYRIE=y
498495
CONFIG_FB_MAC=y
499496
CONFIG_FRAMEBUFFER_CONSOLE=y
497+
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
500498
CONFIG_LOGO=y
501499
CONFIG_SOUND=m
502500
CONFIG_DMASOUND_ATARI=m
@@ -708,7 +706,7 @@ CONFIG_TEST_UUID=m
708706
CONFIG_TEST_XARRAY=m
709707
CONFIG_TEST_OVERFLOW=m
710708
CONFIG_TEST_RHASHTABLE=m
711-
CONFIG_TEST_HASH=m
709+
CONFIG_TEST_SIPHASH=m
712710
CONFIG_TEST_IDA=m
713711
CONFIG_TEST_BITOPS=m
714712
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ CONFIG_NF_TABLES_NETDEV=y
9696
CONFIG_NFT_NUMGEN=m
9797
CONFIG_NFT_CT=m
9898
CONFIG_NFT_FLOW_OFFLOAD=m
99-
CONFIG_NFT_COUNTER=m
10099
CONFIG_NFT_CONNLIMIT=m
101100
CONFIG_NFT_LOG=m
102101
CONFIG_NFT_LIMIT=m
@@ -196,7 +195,6 @@ CONFIG_IP_SET_LIST_SET=m
196195
CONFIG_NFT_DUP_IPV4=m
197196
CONFIG_NFT_FIB_IPV4=m
198197
CONFIG_NF_TABLES_ARP=y
199-
CONFIG_NF_FLOW_TABLE_IPV4=m
200198
CONFIG_NF_LOG_ARP=m
201199
CONFIG_NF_LOG_IPV4=m
202200
CONFIG_IP_NF_IPTABLES=m
@@ -221,7 +219,6 @@ CONFIG_IP_NF_ARPFILTER=m
221219
CONFIG_IP_NF_ARP_MANGLE=m
222220
CONFIG_NFT_DUP_IPV6=m
223221
CONFIG_NFT_FIB_IPV6=m
224-
CONFIG_NF_FLOW_TABLE_IPV6=m
225222
CONFIG_IP6_NF_IPTABLES=m
226223
CONFIG_IP6_NF_MATCH_AH=m
227224
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -591,7 +588,7 @@ CONFIG_TEST_UUID=m
591588
CONFIG_TEST_XARRAY=m
592589
CONFIG_TEST_OVERFLOW=m
593590
CONFIG_TEST_RHASHTABLE=m
594-
CONFIG_TEST_HASH=m
591+
CONFIG_TEST_SIPHASH=m
595592
CONFIG_TEST_IDA=m
596593
CONFIG_TEST_BITOPS=m
597594
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ CONFIG_NF_TABLES_NETDEV=y
9797
CONFIG_NFT_NUMGEN=m
9898
CONFIG_NFT_CT=m
9999
CONFIG_NFT_FLOW_OFFLOAD=m
100-
CONFIG_NFT_COUNTER=m
101100
CONFIG_NFT_CONNLIMIT=m
102101
CONFIG_NFT_LOG=m
103102
CONFIG_NFT_LIMIT=m
@@ -197,7 +196,6 @@ CONFIG_IP_SET_LIST_SET=m
197196
CONFIG_NFT_DUP_IPV4=m
198197
CONFIG_NFT_FIB_IPV4=m
199198
CONFIG_NF_TABLES_ARP=y
200-
CONFIG_NF_FLOW_TABLE_IPV4=m
201199
CONFIG_NF_LOG_ARP=m
202200
CONFIG_NF_LOG_IPV4=m
203201
CONFIG_IP_NF_IPTABLES=m
@@ -222,7 +220,6 @@ CONFIG_IP_NF_ARPFILTER=m
222220
CONFIG_IP_NF_ARP_MANGLE=m
223221
CONFIG_NFT_DUP_IPV6=m
224222
CONFIG_NFT_FIB_IPV6=m
225-
CONFIG_NF_FLOW_TABLE_IPV6=m
226223
CONFIG_IP6_NF_IPTABLES=m
227224
CONFIG_IP6_NF_MATCH_AH=m
228225
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -592,7 +589,7 @@ CONFIG_TEST_UUID=m
592589
CONFIG_TEST_XARRAY=m
593590
CONFIG_TEST_OVERFLOW=m
594591
CONFIG_TEST_RHASHTABLE=m
595-
CONFIG_TEST_HASH=m
592+
CONFIG_TEST_SIPHASH=m
596593
CONFIG_TEST_IDA=m
597594
CONFIG_TEST_BITOPS=m
598595
CONFIG_TEST_VMALLOC=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ CONFIG_NF_TABLES_NETDEV=y
9898
CONFIG_NFT_NUMGEN=m
9999
CONFIG_NFT_CT=m
100100
CONFIG_NFT_FLOW_OFFLOAD=m
101-
CONFIG_NFT_COUNTER=m
102101
CONFIG_NFT_CONNLIMIT=m
103102
CONFIG_NFT_LOG=m
104103
CONFIG_NFT_LIMIT=m
@@ -198,7 +197,6 @@ CONFIG_IP_SET_LIST_SET=m
198197
CONFIG_NFT_DUP_IPV4=m
199198
CONFIG_NFT_FIB_IPV4=m
200199
CONFIG_NF_TABLES_ARP=y
201-
CONFIG_NF_FLOW_TABLE_IPV4=m
202200
CONFIG_NF_LOG_ARP=m
203201
CONFIG_NF_LOG_IPV4=m
204202
CONFIG_IP_NF_IPTABLES=m
@@ -223,7 +221,6 @@ CONFIG_IP_NF_ARPFILTER=m
223221
CONFIG_IP_NF_ARP_MANGLE=m
224222
CONFIG_NFT_DUP_IPV6=m
225223
CONFIG_NFT_FIB_IPV6=m
226-
CONFIG_NF_FLOW_TABLE_IPV6=m
227224
CONFIG_IP6_NF_IPTABLES=m
228225
CONFIG_IP6_NF_MATCH_AH=m
229226
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -610,7 +607,7 @@ CONFIG_TEST_UUID=m
610607
CONFIG_TEST_XARRAY=m
611608
CONFIG_TEST_OVERFLOW=m
612609
CONFIG_TEST_RHASHTABLE=m
613-
CONFIG_TEST_HASH=m
610+
CONFIG_TEST_SIPHASH=m
614611
CONFIG_TEST_IDA=m
615612
CONFIG_TEST_BITOPS=m
616613
CONFIG_TEST_VMALLOC=m

0 commit comments

Comments
 (0)