Skip to content

Commit f1004b2

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - Fix whitespace in Zorro name macros - Fix find_*_bit() signatures - defconfig updates * tag 'm68k-for-v6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.17-rc1 m68k: bitops: Fix find_*_bit() signatures zorro: Remove extra whitespace in macro definitions
2 parents cb7e366 + 695f2c0 commit f1004b2

14 files changed

Lines changed: 56 additions & 89 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ CONFIG_NFT_FIB_NETDEV=m
125125
CONFIG_NFT_REJECT_NETDEV=m
126126
CONFIG_NF_FLOW_TABLE_INET=m
127127
CONFIG_NF_FLOW_TABLE=m
128+
CONFIG_NETFILTER_XTABLES_LEGACY=y
128129
CONFIG_NETFILTER_XT_SET=m
129130
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
130131
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -206,14 +207,12 @@ CONFIG_IP_NF_MATCH_AH=m
206207
CONFIG_IP_NF_MATCH_ECN=m
207208
CONFIG_IP_NF_MATCH_RPFILTER=m
208209
CONFIG_IP_NF_MATCH_TTL=m
209-
CONFIG_IP_NF_FILTER=m
210210
CONFIG_IP_NF_TARGET_REJECT=m
211211
CONFIG_IP_NF_TARGET_SYNPROXY=m
212212
CONFIG_IP_NF_NAT=m
213213
CONFIG_IP_NF_TARGET_MASQUERADE=m
214214
CONFIG_IP_NF_TARGET_NETMAP=m
215215
CONFIG_IP_NF_TARGET_REDIRECT=m
216-
CONFIG_IP_NF_MANGLE=m
217216
CONFIG_IP_NF_TARGET_ECN=m
218217
CONFIG_IP_NF_TARGET_TTL=m
219218
CONFIG_IP_NF_RAW=m
@@ -233,10 +232,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
233232
CONFIG_IP6_NF_MATCH_RT=m
234233
CONFIG_IP6_NF_MATCH_SRH=m
235234
CONFIG_IP6_NF_TARGET_HL=m
236-
CONFIG_IP6_NF_FILTER=m
237235
CONFIG_IP6_NF_TARGET_REJECT=m
238236
CONFIG_IP6_NF_TARGET_SYNPROXY=m
239-
CONFIG_IP6_NF_MANGLE=m
240237
CONFIG_IP6_NF_RAW=m
241238
CONFIG_IP6_NF_NAT=m
242239
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -245,6 +242,7 @@ CONFIG_NF_TABLES_BRIDGE=m
245242
CONFIG_NFT_BRIDGE_META=m
246243
CONFIG_NFT_BRIDGE_REJECT=m
247244
CONFIG_NF_CONNTRACK_BRIDGE=m
245+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
248246
CONFIG_BRIDGE_NF_EBTABLES=m
249247
CONFIG_BRIDGE_EBT_BROUTE=m
250248
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -309,7 +307,6 @@ CONFIG_BLK_DEV_LOOP=y
309307
CONFIG_BLK_DEV_DRBD=m
310308
CONFIG_BLK_DEV_NBD=m
311309
CONFIG_BLK_DEV_RAM=y
312-
CONFIG_CDROM_PKTCDVD=m
313310
CONFIG_ATA_OVER_ETH=m
314311
CONFIG_DUMMY_IRQ=m
315312
CONFIG_RAID_ATTRS=m
@@ -603,6 +600,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
603600
CONFIG_CRYPTO_USER_API_AEAD=m
604601
# CONFIG_CRYPTO_HW is not set
605602
CONFIG_PRIME_NUMBERS=m
603+
CONFIG_CRC_BENCHMARK=y
606604
CONFIG_XZ_DEC_TEST=m
607605
CONFIG_GLOB_SELFTEST=m
608606
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -634,7 +632,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
634632
CONFIG_TEST_FIRMWARE=m
635633
CONFIG_TEST_SYSCTL=m
636634
CONFIG_LINEAR_RANGES_TEST=m
637-
CONFIG_CRC_BENCHMARK=y
638635
CONFIG_TEST_UDELAY=m
639636
CONFIG_TEST_STATIC_KEYS=m
640637
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ CONFIG_NFT_FIB_NETDEV=m
121121
CONFIG_NFT_REJECT_NETDEV=m
122122
CONFIG_NF_FLOW_TABLE_INET=m
123123
CONFIG_NF_FLOW_TABLE=m
124+
CONFIG_NETFILTER_XTABLES_LEGACY=y
124125
CONFIG_NETFILTER_XT_SET=m
125126
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
126127
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -202,14 +203,12 @@ CONFIG_IP_NF_MATCH_AH=m
202203
CONFIG_IP_NF_MATCH_ECN=m
203204
CONFIG_IP_NF_MATCH_RPFILTER=m
204205
CONFIG_IP_NF_MATCH_TTL=m
205-
CONFIG_IP_NF_FILTER=m
206206
CONFIG_IP_NF_TARGET_REJECT=m
207207
CONFIG_IP_NF_TARGET_SYNPROXY=m
208208
CONFIG_IP_NF_NAT=m
209209
CONFIG_IP_NF_TARGET_MASQUERADE=m
210210
CONFIG_IP_NF_TARGET_NETMAP=m
211211
CONFIG_IP_NF_TARGET_REDIRECT=m
212-
CONFIG_IP_NF_MANGLE=m
213212
CONFIG_IP_NF_TARGET_ECN=m
214213
CONFIG_IP_NF_TARGET_TTL=m
215214
CONFIG_IP_NF_RAW=m
@@ -229,10 +228,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
229228
CONFIG_IP6_NF_MATCH_RT=m
230229
CONFIG_IP6_NF_MATCH_SRH=m
231230
CONFIG_IP6_NF_TARGET_HL=m
232-
CONFIG_IP6_NF_FILTER=m
233231
CONFIG_IP6_NF_TARGET_REJECT=m
234232
CONFIG_IP6_NF_TARGET_SYNPROXY=m
235-
CONFIG_IP6_NF_MANGLE=m
236233
CONFIG_IP6_NF_RAW=m
237234
CONFIG_IP6_NF_NAT=m
238235
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -241,6 +238,7 @@ CONFIG_NF_TABLES_BRIDGE=m
241238
CONFIG_NFT_BRIDGE_META=m
242239
CONFIG_NFT_BRIDGE_REJECT=m
243240
CONFIG_NF_CONNTRACK_BRIDGE=m
241+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
244242
CONFIG_BRIDGE_NF_EBTABLES=m
245243
CONFIG_BRIDGE_EBT_BROUTE=m
246244
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -299,7 +297,6 @@ CONFIG_BLK_DEV_LOOP=y
299297
CONFIG_BLK_DEV_DRBD=m
300298
CONFIG_BLK_DEV_NBD=m
301299
CONFIG_BLK_DEV_RAM=y
302-
CONFIG_CDROM_PKTCDVD=m
303300
CONFIG_ATA_OVER_ETH=m
304301
CONFIG_DUMMY_IRQ=m
305302
CONFIG_RAID_ATTRS=m
@@ -560,6 +557,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
560557
CONFIG_CRYPTO_USER_API_AEAD=m
561558
# CONFIG_CRYPTO_HW is not set
562559
CONFIG_PRIME_NUMBERS=m
560+
CONFIG_CRC_BENCHMARK=y
563561
CONFIG_XZ_DEC_TEST=m
564562
CONFIG_GLOB_SELFTEST=m
565563
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -591,7 +589,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
591589
CONFIG_TEST_FIRMWARE=m
592590
CONFIG_TEST_SYSCTL=m
593591
CONFIG_LINEAR_RANGES_TEST=m
594-
CONFIG_CRC_BENCHMARK=y
595592
CONFIG_TEST_UDELAY=m
596593
CONFIG_TEST_STATIC_KEYS=m
597594
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ CONFIG_NFT_FIB_NETDEV=m
128128
CONFIG_NFT_REJECT_NETDEV=m
129129
CONFIG_NF_FLOW_TABLE_INET=m
130130
CONFIG_NF_FLOW_TABLE=m
131+
CONFIG_NETFILTER_XTABLES_LEGACY=y
131132
CONFIG_NETFILTER_XT_SET=m
132133
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
133134
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -209,14 +210,12 @@ CONFIG_IP_NF_MATCH_AH=m
209210
CONFIG_IP_NF_MATCH_ECN=m
210211
CONFIG_IP_NF_MATCH_RPFILTER=m
211212
CONFIG_IP_NF_MATCH_TTL=m
212-
CONFIG_IP_NF_FILTER=m
213213
CONFIG_IP_NF_TARGET_REJECT=m
214214
CONFIG_IP_NF_TARGET_SYNPROXY=m
215215
CONFIG_IP_NF_NAT=m
216216
CONFIG_IP_NF_TARGET_MASQUERADE=m
217217
CONFIG_IP_NF_TARGET_NETMAP=m
218218
CONFIG_IP_NF_TARGET_REDIRECT=m
219-
CONFIG_IP_NF_MANGLE=m
220219
CONFIG_IP_NF_TARGET_ECN=m
221220
CONFIG_IP_NF_TARGET_TTL=m
222221
CONFIG_IP_NF_RAW=m
@@ -236,10 +235,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
236235
CONFIG_IP6_NF_MATCH_RT=m
237236
CONFIG_IP6_NF_MATCH_SRH=m
238237
CONFIG_IP6_NF_TARGET_HL=m
239-
CONFIG_IP6_NF_FILTER=m
240238
CONFIG_IP6_NF_TARGET_REJECT=m
241239
CONFIG_IP6_NF_TARGET_SYNPROXY=m
242-
CONFIG_IP6_NF_MANGLE=m
243240
CONFIG_IP6_NF_RAW=m
244241
CONFIG_IP6_NF_NAT=m
245242
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -248,6 +245,7 @@ CONFIG_NF_TABLES_BRIDGE=m
248245
CONFIG_NFT_BRIDGE_META=m
249246
CONFIG_NFT_BRIDGE_REJECT=m
250247
CONFIG_NF_CONNTRACK_BRIDGE=m
248+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
251249
CONFIG_BRIDGE_NF_EBTABLES=m
252250
CONFIG_BRIDGE_EBT_BROUTE=m
253251
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -310,7 +308,6 @@ CONFIG_BLK_DEV_LOOP=y
310308
CONFIG_BLK_DEV_DRBD=m
311309
CONFIG_BLK_DEV_NBD=m
312310
CONFIG_BLK_DEV_RAM=y
313-
CONFIG_CDROM_PKTCDVD=m
314311
CONFIG_ATA_OVER_ETH=m
315312
CONFIG_DUMMY_IRQ=m
316313
CONFIG_RAID_ATTRS=m
@@ -580,6 +577,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
580577
CONFIG_CRYPTO_USER_API_AEAD=m
581578
# CONFIG_CRYPTO_HW is not set
582579
CONFIG_PRIME_NUMBERS=m
580+
CONFIG_CRC_BENCHMARK=y
583581
CONFIG_XZ_DEC_TEST=m
584582
CONFIG_GLOB_SELFTEST=m
585583
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -611,7 +609,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
611609
CONFIG_TEST_FIRMWARE=m
612610
CONFIG_TEST_SYSCTL=m
613611
CONFIG_LINEAR_RANGES_TEST=m
614-
CONFIG_CRC_BENCHMARK=y
615612
CONFIG_TEST_UDELAY=m
616613
CONFIG_TEST_STATIC_KEYS=m
617614
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ CONFIG_NFT_FIB_NETDEV=m
118118
CONFIG_NFT_REJECT_NETDEV=m
119119
CONFIG_NF_FLOW_TABLE_INET=m
120120
CONFIG_NF_FLOW_TABLE=m
121+
CONFIG_NETFILTER_XTABLES_LEGACY=y
121122
CONFIG_NETFILTER_XT_SET=m
122123
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
123124
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -199,14 +200,12 @@ CONFIG_IP_NF_MATCH_AH=m
199200
CONFIG_IP_NF_MATCH_ECN=m
200201
CONFIG_IP_NF_MATCH_RPFILTER=m
201202
CONFIG_IP_NF_MATCH_TTL=m
202-
CONFIG_IP_NF_FILTER=m
203203
CONFIG_IP_NF_TARGET_REJECT=m
204204
CONFIG_IP_NF_TARGET_SYNPROXY=m
205205
CONFIG_IP_NF_NAT=m
206206
CONFIG_IP_NF_TARGET_MASQUERADE=m
207207
CONFIG_IP_NF_TARGET_NETMAP=m
208208
CONFIG_IP_NF_TARGET_REDIRECT=m
209-
CONFIG_IP_NF_MANGLE=m
210209
CONFIG_IP_NF_TARGET_ECN=m
211210
CONFIG_IP_NF_TARGET_TTL=m
212211
CONFIG_IP_NF_RAW=m
@@ -226,10 +225,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
226225
CONFIG_IP6_NF_MATCH_RT=m
227226
CONFIG_IP6_NF_MATCH_SRH=m
228227
CONFIG_IP6_NF_TARGET_HL=m
229-
CONFIG_IP6_NF_FILTER=m
230228
CONFIG_IP6_NF_TARGET_REJECT=m
231229
CONFIG_IP6_NF_TARGET_SYNPROXY=m
232-
CONFIG_IP6_NF_MANGLE=m
233230
CONFIG_IP6_NF_RAW=m
234231
CONFIG_IP6_NF_NAT=m
235232
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -238,6 +235,7 @@ CONFIG_NF_TABLES_BRIDGE=m
238235
CONFIG_NFT_BRIDGE_META=m
239236
CONFIG_NFT_BRIDGE_REJECT=m
240237
CONFIG_NF_CONNTRACK_BRIDGE=m
238+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
241239
CONFIG_BRIDGE_NF_EBTABLES=m
242240
CONFIG_BRIDGE_EBT_BROUTE=m
243241
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -296,7 +294,6 @@ CONFIG_BLK_DEV_LOOP=y
296294
CONFIG_BLK_DEV_DRBD=m
297295
CONFIG_BLK_DEV_NBD=m
298296
CONFIG_BLK_DEV_RAM=y
299-
CONFIG_CDROM_PKTCDVD=m
300297
CONFIG_ATA_OVER_ETH=m
301298
CONFIG_DUMMY_IRQ=m
302299
CONFIG_RAID_ATTRS=m
@@ -552,6 +549,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
552549
CONFIG_CRYPTO_USER_API_AEAD=m
553550
# CONFIG_CRYPTO_HW is not set
554551
CONFIG_PRIME_NUMBERS=m
552+
CONFIG_CRC_BENCHMARK=y
555553
CONFIG_XZ_DEC_TEST=m
556554
CONFIG_GLOB_SELFTEST=m
557555
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -583,7 +581,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
583581
CONFIG_TEST_FIRMWARE=m
584582
CONFIG_TEST_SYSCTL=m
585583
CONFIG_LINEAR_RANGES_TEST=m
586-
CONFIG_CRC_BENCHMARK=y
587584
CONFIG_TEST_UDELAY=m
588585
CONFIG_TEST_STATIC_KEYS=m
589586
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ CONFIG_NFT_FIB_NETDEV=m
120120
CONFIG_NFT_REJECT_NETDEV=m
121121
CONFIG_NF_FLOW_TABLE_INET=m
122122
CONFIG_NF_FLOW_TABLE=m
123+
CONFIG_NETFILTER_XTABLES_LEGACY=y
123124
CONFIG_NETFILTER_XT_SET=m
124125
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
125126
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -201,14 +202,12 @@ CONFIG_IP_NF_MATCH_AH=m
201202
CONFIG_IP_NF_MATCH_ECN=m
202203
CONFIG_IP_NF_MATCH_RPFILTER=m
203204
CONFIG_IP_NF_MATCH_TTL=m
204-
CONFIG_IP_NF_FILTER=m
205205
CONFIG_IP_NF_TARGET_REJECT=m
206206
CONFIG_IP_NF_TARGET_SYNPROXY=m
207207
CONFIG_IP_NF_NAT=m
208208
CONFIG_IP_NF_TARGET_MASQUERADE=m
209209
CONFIG_IP_NF_TARGET_NETMAP=m
210210
CONFIG_IP_NF_TARGET_REDIRECT=m
211-
CONFIG_IP_NF_MANGLE=m
212211
CONFIG_IP_NF_TARGET_ECN=m
213212
CONFIG_IP_NF_TARGET_TTL=m
214213
CONFIG_IP_NF_RAW=m
@@ -228,10 +227,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
228227
CONFIG_IP6_NF_MATCH_RT=m
229228
CONFIG_IP6_NF_MATCH_SRH=m
230229
CONFIG_IP6_NF_TARGET_HL=m
231-
CONFIG_IP6_NF_FILTER=m
232230
CONFIG_IP6_NF_TARGET_REJECT=m
233231
CONFIG_IP6_NF_TARGET_SYNPROXY=m
234-
CONFIG_IP6_NF_MANGLE=m
235232
CONFIG_IP6_NF_RAW=m
236233
CONFIG_IP6_NF_NAT=m
237234
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -240,6 +237,7 @@ CONFIG_NF_TABLES_BRIDGE=m
240237
CONFIG_NFT_BRIDGE_META=m
241238
CONFIG_NFT_BRIDGE_REJECT=m
242239
CONFIG_NF_CONNTRACK_BRIDGE=m
240+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
243241
CONFIG_BRIDGE_NF_EBTABLES=m
244242
CONFIG_BRIDGE_EBT_BROUTE=m
245243
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -298,7 +296,6 @@ CONFIG_BLK_DEV_LOOP=y
298296
CONFIG_BLK_DEV_DRBD=m
299297
CONFIG_BLK_DEV_NBD=m
300298
CONFIG_BLK_DEV_RAM=y
301-
CONFIG_CDROM_PKTCDVD=m
302299
CONFIG_ATA_OVER_ETH=m
303300
CONFIG_DUMMY_IRQ=m
304301
CONFIG_RAID_ATTRS=m
@@ -562,6 +559,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
562559
CONFIG_CRYPTO_USER_API_AEAD=m
563560
# CONFIG_CRYPTO_HW is not set
564561
CONFIG_PRIME_NUMBERS=m
562+
CONFIG_CRC_BENCHMARK=y
565563
CONFIG_XZ_DEC_TEST=m
566564
CONFIG_GLOB_SELFTEST=m
567565
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -593,7 +591,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
593591
CONFIG_TEST_FIRMWARE=m
594592
CONFIG_TEST_SYSCTL=m
595593
CONFIG_LINEAR_RANGES_TEST=m
596-
CONFIG_CRC_BENCHMARK=y
597594
CONFIG_TEST_UDELAY=m
598595
CONFIG_TEST_STATIC_KEYS=m
599596
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ CONFIG_NFT_FIB_NETDEV=m
119119
CONFIG_NFT_REJECT_NETDEV=m
120120
CONFIG_NF_FLOW_TABLE_INET=m
121121
CONFIG_NF_FLOW_TABLE=m
122+
CONFIG_NETFILTER_XTABLES_LEGACY=y
122123
CONFIG_NETFILTER_XT_SET=m
123124
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124125
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,14 +201,12 @@ CONFIG_IP_NF_MATCH_AH=m
200201
CONFIG_IP_NF_MATCH_ECN=m
201202
CONFIG_IP_NF_MATCH_RPFILTER=m
202203
CONFIG_IP_NF_MATCH_TTL=m
203-
CONFIG_IP_NF_FILTER=m
204204
CONFIG_IP_NF_TARGET_REJECT=m
205205
CONFIG_IP_NF_TARGET_SYNPROXY=m
206206
CONFIG_IP_NF_NAT=m
207207
CONFIG_IP_NF_TARGET_MASQUERADE=m
208208
CONFIG_IP_NF_TARGET_NETMAP=m
209209
CONFIG_IP_NF_TARGET_REDIRECT=m
210-
CONFIG_IP_NF_MANGLE=m
211210
CONFIG_IP_NF_TARGET_ECN=m
212211
CONFIG_IP_NF_TARGET_TTL=m
213212
CONFIG_IP_NF_RAW=m
@@ -227,10 +226,8 @@ CONFIG_IP6_NF_MATCH_RPFILTER=m
227226
CONFIG_IP6_NF_MATCH_RT=m
228227
CONFIG_IP6_NF_MATCH_SRH=m
229228
CONFIG_IP6_NF_TARGET_HL=m
230-
CONFIG_IP6_NF_FILTER=m
231229
CONFIG_IP6_NF_TARGET_REJECT=m
232230
CONFIG_IP6_NF_TARGET_SYNPROXY=m
233-
CONFIG_IP6_NF_MANGLE=m
234231
CONFIG_IP6_NF_RAW=m
235232
CONFIG_IP6_NF_NAT=m
236233
CONFIG_IP6_NF_TARGET_MASQUERADE=m
@@ -239,6 +236,7 @@ CONFIG_NF_TABLES_BRIDGE=m
239236
CONFIG_NFT_BRIDGE_META=m
240237
CONFIG_NFT_BRIDGE_REJECT=m
241238
CONFIG_NF_CONNTRACK_BRIDGE=m
239+
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
242240
CONFIG_BRIDGE_NF_EBTABLES=m
243241
CONFIG_BRIDGE_EBT_BROUTE=m
244242
CONFIG_BRIDGE_EBT_T_FILTER=m
@@ -298,7 +296,6 @@ CONFIG_BLK_DEV_LOOP=y
298296
CONFIG_BLK_DEV_DRBD=m
299297
CONFIG_BLK_DEV_NBD=m
300298
CONFIG_BLK_DEV_RAM=y
301-
CONFIG_CDROM_PKTCDVD=m
302299
CONFIG_ATA_OVER_ETH=m
303300
CONFIG_DUMMY_IRQ=m
304301
CONFIG_RAID_ATTRS=m
@@ -579,6 +576,7 @@ CONFIG_CRYPTO_USER_API_RNG=m
579576
CONFIG_CRYPTO_USER_API_AEAD=m
580577
# CONFIG_CRYPTO_HW is not set
581578
CONFIG_PRIME_NUMBERS=m
579+
CONFIG_CRC_BENCHMARK=y
582580
CONFIG_XZ_DEC_TEST=m
583581
CONFIG_GLOB_SELFTEST=m
584582
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -610,7 +608,6 @@ CONFIG_FIND_BIT_BENCHMARK=m
610608
CONFIG_TEST_FIRMWARE=m
611609
CONFIG_TEST_SYSCTL=m
612610
CONFIG_LINEAR_RANGES_TEST=m
613-
CONFIG_CRC_BENCHMARK=y
614611
CONFIG_TEST_UDELAY=m
615612
CONFIG_TEST_STATIC_KEYS=m
616613
CONFIG_TEST_KMOD=m

0 commit comments

Comments
 (0)