Skip to content

Commit b44bf94

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v5.13-rc1
 - Drop CONFIG_NF_LOG_NETDEV=m (removed in commit 1510618 ("netfilter: nf_log_netdev: merge with nf_log_syslog")), - Enable modular build of IPv4 packet logging (no longer auto-enabled since commit db3187a ("netfilter: nf_log_ipv4: rename to nf_log_syslog")), - Drop CONFIG_NF_LOG_BRIDGE=m (removed in commit 77ccee9 ("netfilter: nf_log_bridge: merge with nf_log_syslog")), - Enable modular build of ECDSA crypto algorithm, - Enable modular build of 64bit/32bit division and modulo test. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/20210510095302.4125561-1-geert@linux-m68k.org
1 parent 9a51ebd commit b44bf94

12 files changed

Lines changed: 36 additions & 24 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ CONFIG_IPV6_VTI=m
8585
CONFIG_IPV6_GRE=m
8686
CONFIG_NETFILTER=y
8787
CONFIG_NF_CONNTRACK=m
88-
CONFIG_NF_LOG_NETDEV=m
8988
CONFIG_NF_CONNTRACK_ZONES=y
9089
# CONFIG_NF_CONNTRACK_PROCFS is not set
9190
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -207,6 +206,7 @@ CONFIG_NFT_FIB_IPV4=m
207206
CONFIG_NF_TABLES_ARP=y
208207
CONFIG_NF_FLOW_TABLE_IPV4=m
209208
CONFIG_NF_LOG_ARP=m
209+
CONFIG_NF_LOG_IPV4=m
210210
CONFIG_IP_NF_IPTABLES=m
211211
CONFIG_IP_NF_MATCH_AH=m
212212
CONFIG_IP_NF_MATCH_ECN=m
@@ -253,7 +253,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
253253
CONFIG_NF_TABLES_BRIDGE=m
254254
CONFIG_NFT_BRIDGE_META=m
255255
CONFIG_NFT_BRIDGE_REJECT=m
256-
CONFIG_NF_LOG_BRIDGE=m
257256
CONFIG_NF_CONNTRACK_BRIDGE=m
258257
CONFIG_BRIDGE_NF_EBTABLES=m
259258
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -563,6 +562,7 @@ CONFIG_CRYPTO_TEST=m
563562
CONFIG_CRYPTO_RSA=m
564563
CONFIG_CRYPTO_DH=m
565564
CONFIG_CRYPTO_ECDH=m
565+
CONFIG_CRYPTO_ECDSA=m
566566
CONFIG_CRYPTO_ECRDSA=m
567567
CONFIG_CRYPTO_SM2=m
568568
CONFIG_CRYPTO_CURVE25519=m
@@ -627,6 +627,7 @@ CONFIG_KUNIT_ALL_TESTS=m
627627
CONFIG_TEST_LIST_SORT=m
628628
CONFIG_TEST_MIN_HEAP=m
629629
CONFIG_TEST_SORT=m
630+
CONFIG_TEST_DIV64=m
630631
CONFIG_REED_SOLOMON_TEST=m
631632
CONFIG_ATOMIC64_SELFTEST=m
632633
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ CONFIG_IPV6_VTI=m
8181
CONFIG_IPV6_GRE=m
8282
CONFIG_NETFILTER=y
8383
CONFIG_NF_CONNTRACK=m
84-
CONFIG_NF_LOG_NETDEV=m
8584
CONFIG_NF_CONNTRACK_ZONES=y
8685
# CONFIG_NF_CONNTRACK_PROCFS is not set
8786
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -203,6 +202,7 @@ CONFIG_NFT_FIB_IPV4=m
203202
CONFIG_NF_TABLES_ARP=y
204203
CONFIG_NF_FLOW_TABLE_IPV4=m
205204
CONFIG_NF_LOG_ARP=m
205+
CONFIG_NF_LOG_IPV4=m
206206
CONFIG_IP_NF_IPTABLES=m
207207
CONFIG_IP_NF_MATCH_AH=m
208208
CONFIG_IP_NF_MATCH_ECN=m
@@ -249,7 +249,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
249249
CONFIG_NF_TABLES_BRIDGE=m
250250
CONFIG_NFT_BRIDGE_META=m
251251
CONFIG_NFT_BRIDGE_REJECT=m
252-
CONFIG_NF_LOG_BRIDGE=m
253252
CONFIG_NF_CONNTRACK_BRIDGE=m
254253
CONFIG_BRIDGE_NF_EBTABLES=m
255254
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -519,6 +518,7 @@ CONFIG_CRYPTO_TEST=m
519518
CONFIG_CRYPTO_RSA=m
520519
CONFIG_CRYPTO_DH=m
521520
CONFIG_CRYPTO_ECDH=m
521+
CONFIG_CRYPTO_ECDSA=m
522522
CONFIG_CRYPTO_ECRDSA=m
523523
CONFIG_CRYPTO_SM2=m
524524
CONFIG_CRYPTO_CURVE25519=m
@@ -583,6 +583,7 @@ CONFIG_KUNIT_ALL_TESTS=m
583583
CONFIG_TEST_LIST_SORT=m
584584
CONFIG_TEST_MIN_HEAP=m
585585
CONFIG_TEST_SORT=m
586+
CONFIG_TEST_DIV64=m
586587
CONFIG_REED_SOLOMON_TEST=m
587588
CONFIG_ATOMIC64_SELFTEST=m
588589
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ CONFIG_IPV6_VTI=m
8888
CONFIG_IPV6_GRE=m
8989
CONFIG_NETFILTER=y
9090
CONFIG_NF_CONNTRACK=m
91-
CONFIG_NF_LOG_NETDEV=m
9291
CONFIG_NF_CONNTRACK_ZONES=y
9392
# CONFIG_NF_CONNTRACK_PROCFS is not set
9493
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -210,6 +209,7 @@ CONFIG_NFT_FIB_IPV4=m
210209
CONFIG_NF_TABLES_ARP=y
211210
CONFIG_NF_FLOW_TABLE_IPV4=m
212211
CONFIG_NF_LOG_ARP=m
212+
CONFIG_NF_LOG_IPV4=m
213213
CONFIG_IP_NF_IPTABLES=m
214214
CONFIG_IP_NF_MATCH_AH=m
215215
CONFIG_IP_NF_MATCH_ECN=m
@@ -256,7 +256,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
256256
CONFIG_NF_TABLES_BRIDGE=m
257257
CONFIG_NFT_BRIDGE_META=m
258258
CONFIG_NFT_BRIDGE_REJECT=m
259-
CONFIG_NF_LOG_BRIDGE=m
260259
CONFIG_NF_CONNTRACK_BRIDGE=m
261260
CONFIG_BRIDGE_NF_EBTABLES=m
262261
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -541,6 +540,7 @@ CONFIG_CRYPTO_TEST=m
541540
CONFIG_CRYPTO_RSA=m
542541
CONFIG_CRYPTO_DH=m
543542
CONFIG_CRYPTO_ECDH=m
543+
CONFIG_CRYPTO_ECDSA=m
544544
CONFIG_CRYPTO_ECRDSA=m
545545
CONFIG_CRYPTO_SM2=m
546546
CONFIG_CRYPTO_CURVE25519=m
@@ -605,6 +605,7 @@ CONFIG_KUNIT_ALL_TESTS=m
605605
CONFIG_TEST_LIST_SORT=m
606606
CONFIG_TEST_MIN_HEAP=m
607607
CONFIG_TEST_SORT=m
608+
CONFIG_TEST_DIV64=m
608609
CONFIG_REED_SOLOMON_TEST=m
609610
CONFIG_ATOMIC64_SELFTEST=m
610611
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_IPV6_VTI=m
7878
CONFIG_IPV6_GRE=m
7979
CONFIG_NETFILTER=y
8080
CONFIG_NF_CONNTRACK=m
81-
CONFIG_NF_LOG_NETDEV=m
8281
CONFIG_NF_CONNTRACK_ZONES=y
8382
# CONFIG_NF_CONNTRACK_PROCFS is not set
8483
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -200,6 +199,7 @@ CONFIG_NFT_FIB_IPV4=m
200199
CONFIG_NF_TABLES_ARP=y
201200
CONFIG_NF_FLOW_TABLE_IPV4=m
202201
CONFIG_NF_LOG_ARP=m
202+
CONFIG_NF_LOG_IPV4=m
203203
CONFIG_IP_NF_IPTABLES=m
204204
CONFIG_IP_NF_MATCH_AH=m
205205
CONFIG_IP_NF_MATCH_ECN=m
@@ -246,7 +246,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
246246
CONFIG_NF_TABLES_BRIDGE=m
247247
CONFIG_NFT_BRIDGE_META=m
248248
CONFIG_NFT_BRIDGE_REJECT=m
249-
CONFIG_NF_LOG_BRIDGE=m
250249
CONFIG_NF_CONNTRACK_BRIDGE=m
251250
CONFIG_BRIDGE_NF_EBTABLES=m
252251
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -512,6 +511,7 @@ CONFIG_CRYPTO_TEST=m
512511
CONFIG_CRYPTO_RSA=m
513512
CONFIG_CRYPTO_DH=m
514513
CONFIG_CRYPTO_ECDH=m
514+
CONFIG_CRYPTO_ECDSA=m
515515
CONFIG_CRYPTO_ECRDSA=m
516516
CONFIG_CRYPTO_SM2=m
517517
CONFIG_CRYPTO_CURVE25519=m
@@ -576,6 +576,7 @@ CONFIG_KUNIT_ALL_TESTS=m
576576
CONFIG_TEST_LIST_SORT=m
577577
CONFIG_TEST_MIN_HEAP=m
578578
CONFIG_TEST_SORT=m
579+
CONFIG_TEST_DIV64=m
579580
CONFIG_REED_SOLOMON_TEST=m
580581
CONFIG_ATOMIC64_SELFTEST=m
581582
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ CONFIG_IPV6_VTI=m
8080
CONFIG_IPV6_GRE=m
8181
CONFIG_NETFILTER=y
8282
CONFIG_NF_CONNTRACK=m
83-
CONFIG_NF_LOG_NETDEV=m
8483
CONFIG_NF_CONNTRACK_ZONES=y
8584
# CONFIG_NF_CONNTRACK_PROCFS is not set
8685
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -202,6 +201,7 @@ CONFIG_NFT_FIB_IPV4=m
202201
CONFIG_NF_TABLES_ARP=y
203202
CONFIG_NF_FLOW_TABLE_IPV4=m
204203
CONFIG_NF_LOG_ARP=m
204+
CONFIG_NF_LOG_IPV4=m
205205
CONFIG_IP_NF_IPTABLES=m
206206
CONFIG_IP_NF_MATCH_AH=m
207207
CONFIG_IP_NF_MATCH_ECN=m
@@ -248,7 +248,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
248248
CONFIG_NF_TABLES_BRIDGE=m
249249
CONFIG_NFT_BRIDGE_META=m
250250
CONFIG_NFT_BRIDGE_REJECT=m
251-
CONFIG_NF_LOG_BRIDGE=m
252251
CONFIG_NF_CONNTRACK_BRIDGE=m
253252
CONFIG_BRIDGE_NF_EBTABLES=m
254253
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -521,6 +520,7 @@ CONFIG_CRYPTO_TEST=m
521520
CONFIG_CRYPTO_RSA=m
522521
CONFIG_CRYPTO_DH=m
523522
CONFIG_CRYPTO_ECDH=m
523+
CONFIG_CRYPTO_ECDSA=m
524524
CONFIG_CRYPTO_ECRDSA=m
525525
CONFIG_CRYPTO_SM2=m
526526
CONFIG_CRYPTO_CURVE25519=m
@@ -585,6 +585,7 @@ CONFIG_KUNIT_ALL_TESTS=m
585585
CONFIG_TEST_LIST_SORT=m
586586
CONFIG_TEST_MIN_HEAP=m
587587
CONFIG_TEST_SORT=m
588+
CONFIG_TEST_DIV64=m
588589
CONFIG_REED_SOLOMON_TEST=m
589590
CONFIG_ATOMIC64_SELFTEST=m
590591
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_IPV6_VTI=m
7979
CONFIG_IPV6_GRE=m
8080
CONFIG_NETFILTER=y
8181
CONFIG_NF_CONNTRACK=m
82-
CONFIG_NF_LOG_NETDEV=m
8382
CONFIG_NF_CONNTRACK_ZONES=y
8483
# CONFIG_NF_CONNTRACK_PROCFS is not set
8584
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -201,6 +200,7 @@ CONFIG_NFT_FIB_IPV4=m
201200
CONFIG_NF_TABLES_ARP=y
202201
CONFIG_NF_FLOW_TABLE_IPV4=m
203202
CONFIG_NF_LOG_ARP=m
203+
CONFIG_NF_LOG_IPV4=m
204204
CONFIG_IP_NF_IPTABLES=m
205205
CONFIG_IP_NF_MATCH_AH=m
206206
CONFIG_IP_NF_MATCH_ECN=m
@@ -247,7 +247,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
247247
CONFIG_NF_TABLES_BRIDGE=m
248248
CONFIG_NFT_BRIDGE_META=m
249249
CONFIG_NFT_BRIDGE_REJECT=m
250-
CONFIG_NF_LOG_BRIDGE=m
251250
CONFIG_NF_CONNTRACK_BRIDGE=m
252251
CONFIG_BRIDGE_NF_EBTABLES=m
253252
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -544,6 +543,7 @@ CONFIG_CRYPTO_TEST=m
544543
CONFIG_CRYPTO_RSA=m
545544
CONFIG_CRYPTO_DH=m
546545
CONFIG_CRYPTO_ECDH=m
546+
CONFIG_CRYPTO_ECDSA=m
547547
CONFIG_CRYPTO_ECRDSA=m
548548
CONFIG_CRYPTO_SM2=m
549549
CONFIG_CRYPTO_CURVE25519=m
@@ -608,6 +608,7 @@ CONFIG_KUNIT_ALL_TESTS=m
608608
CONFIG_TEST_LIST_SORT=m
609609
CONFIG_TEST_MIN_HEAP=m
610610
CONFIG_TEST_SORT=m
611+
CONFIG_TEST_DIV64=m
611612
CONFIG_REED_SOLOMON_TEST=m
612613
CONFIG_ATOMIC64_SELFTEST=m
613614
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ CONFIG_IPV6_VTI=m
9999
CONFIG_IPV6_GRE=m
100100
CONFIG_NETFILTER=y
101101
CONFIG_NF_CONNTRACK=m
102-
CONFIG_NF_LOG_NETDEV=m
103102
CONFIG_NF_CONNTRACK_ZONES=y
104103
# CONFIG_NF_CONNTRACK_PROCFS is not set
105104
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -221,6 +220,7 @@ CONFIG_NFT_FIB_IPV4=m
221220
CONFIG_NF_TABLES_ARP=y
222221
CONFIG_NF_FLOW_TABLE_IPV4=m
223222
CONFIG_NF_LOG_ARP=m
223+
CONFIG_NF_LOG_IPV4=m
224224
CONFIG_IP_NF_IPTABLES=m
225225
CONFIG_IP_NF_MATCH_AH=m
226226
CONFIG_IP_NF_MATCH_ECN=m
@@ -267,7 +267,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
267267
CONFIG_NF_TABLES_BRIDGE=m
268268
CONFIG_NFT_BRIDGE_META=m
269269
CONFIG_NFT_BRIDGE_REJECT=m
270-
CONFIG_NF_LOG_BRIDGE=m
271270
CONFIG_NF_CONNTRACK_BRIDGE=m
272271
CONFIG_BRIDGE_NF_EBTABLES=m
273272
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -630,6 +629,7 @@ CONFIG_CRYPTO_TEST=m
630629
CONFIG_CRYPTO_RSA=m
631630
CONFIG_CRYPTO_DH=m
632631
CONFIG_CRYPTO_ECDH=m
632+
CONFIG_CRYPTO_ECDSA=m
633633
CONFIG_CRYPTO_ECRDSA=m
634634
CONFIG_CRYPTO_SM2=m
635635
CONFIG_CRYPTO_CURVE25519=m
@@ -694,6 +694,7 @@ CONFIG_KUNIT_ALL_TESTS=m
694694
CONFIG_TEST_LIST_SORT=m
695695
CONFIG_TEST_MIN_HEAP=m
696696
CONFIG_TEST_SORT=m
697+
CONFIG_TEST_DIV64=m
697698
CONFIG_REED_SOLOMON_TEST=m
698699
CONFIG_ATOMIC64_SELFTEST=m
699700
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ CONFIG_IPV6_VTI=m
7777
CONFIG_IPV6_GRE=m
7878
CONFIG_NETFILTER=y
7979
CONFIG_NF_CONNTRACK=m
80-
CONFIG_NF_LOG_NETDEV=m
8180
CONFIG_NF_CONNTRACK_ZONES=y
8281
# CONFIG_NF_CONNTRACK_PROCFS is not set
8382
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -199,6 +198,7 @@ CONFIG_NFT_FIB_IPV4=m
199198
CONFIG_NF_TABLES_ARP=y
200199
CONFIG_NF_FLOW_TABLE_IPV4=m
201200
CONFIG_NF_LOG_ARP=m
201+
CONFIG_NF_LOG_IPV4=m
202202
CONFIG_IP_NF_IPTABLES=m
203203
CONFIG_IP_NF_MATCH_AH=m
204204
CONFIG_IP_NF_MATCH_ECN=m
@@ -245,7 +245,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
245245
CONFIG_NF_TABLES_BRIDGE=m
246246
CONFIG_NFT_BRIDGE_META=m
247247
CONFIG_NFT_BRIDGE_REJECT=m
248-
CONFIG_NF_LOG_BRIDGE=m
249248
CONFIG_NF_CONNTRACK_BRIDGE=m
250249
CONFIG_BRIDGE_NF_EBTABLES=m
251250
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -511,6 +510,7 @@ CONFIG_CRYPTO_TEST=m
511510
CONFIG_CRYPTO_RSA=m
512511
CONFIG_CRYPTO_DH=m
513512
CONFIG_CRYPTO_ECDH=m
513+
CONFIG_CRYPTO_ECDSA=m
514514
CONFIG_CRYPTO_ECRDSA=m
515515
CONFIG_CRYPTO_SM2=m
516516
CONFIG_CRYPTO_CURVE25519=m
@@ -575,6 +575,7 @@ CONFIG_KUNIT_ALL_TESTS=m
575575
CONFIG_TEST_LIST_SORT=m
576576
CONFIG_TEST_MIN_HEAP=m
577577
CONFIG_TEST_SORT=m
578+
CONFIG_TEST_DIV64=m
578579
CONFIG_REED_SOLOMON_TEST=m
579580
CONFIG_ATOMIC64_SELFTEST=m
580581
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_IPV6_VTI=m
7878
CONFIG_IPV6_GRE=m
7979
CONFIG_NETFILTER=y
8080
CONFIG_NF_CONNTRACK=m
81-
CONFIG_NF_LOG_NETDEV=m
8281
CONFIG_NF_CONNTRACK_ZONES=y
8382
# CONFIG_NF_CONNTRACK_PROCFS is not set
8483
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -200,6 +199,7 @@ CONFIG_NFT_FIB_IPV4=m
200199
CONFIG_NF_TABLES_ARP=y
201200
CONFIG_NF_FLOW_TABLE_IPV4=m
202201
CONFIG_NF_LOG_ARP=m
202+
CONFIG_NF_LOG_IPV4=m
203203
CONFIG_IP_NF_IPTABLES=m
204204
CONFIG_IP_NF_MATCH_AH=m
205205
CONFIG_IP_NF_MATCH_ECN=m
@@ -246,7 +246,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
246246
CONFIG_NF_TABLES_BRIDGE=m
247247
CONFIG_NFT_BRIDGE_META=m
248248
CONFIG_NFT_BRIDGE_REJECT=m
249-
CONFIG_NF_LOG_BRIDGE=m
250249
CONFIG_NF_CONNTRACK_BRIDGE=m
251250
CONFIG_BRIDGE_NF_EBTABLES=m
252251
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -512,6 +511,7 @@ CONFIG_CRYPTO_TEST=m
512511
CONFIG_CRYPTO_RSA=m
513512
CONFIG_CRYPTO_DH=m
514513
CONFIG_CRYPTO_ECDH=m
514+
CONFIG_CRYPTO_ECDSA=m
515515
CONFIG_CRYPTO_ECRDSA=m
516516
CONFIG_CRYPTO_SM2=m
517517
CONFIG_CRYPTO_CURVE25519=m
@@ -576,6 +576,7 @@ CONFIG_KUNIT_ALL_TESTS=m
576576
CONFIG_TEST_LIST_SORT=m
577577
CONFIG_TEST_MIN_HEAP=m
578578
CONFIG_TEST_SORT=m
579+
CONFIG_TEST_DIV64=m
579580
CONFIG_REED_SOLOMON_TEST=m
580581
CONFIG_ATOMIC64_SELFTEST=m
581582
CONFIG_ASYNC_RAID6_TEST=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_IPV6_VTI=m
7979
CONFIG_IPV6_GRE=m
8080
CONFIG_NETFILTER=y
8181
CONFIG_NF_CONNTRACK=m
82-
CONFIG_NF_LOG_NETDEV=m
8382
CONFIG_NF_CONNTRACK_ZONES=y
8483
# CONFIG_NF_CONNTRACK_PROCFS is not set
8584
# CONFIG_NF_CT_PROTO_DCCP is not set
@@ -201,6 +200,7 @@ CONFIG_NFT_FIB_IPV4=m
201200
CONFIG_NF_TABLES_ARP=y
202201
CONFIG_NF_FLOW_TABLE_IPV4=m
203202
CONFIG_NF_LOG_ARP=m
203+
CONFIG_NF_LOG_IPV4=m
204204
CONFIG_IP_NF_IPTABLES=m
205205
CONFIG_IP_NF_MATCH_AH=m
206206
CONFIG_IP_NF_MATCH_ECN=m
@@ -247,7 +247,6 @@ CONFIG_IP6_NF_TARGET_NPT=m
247247
CONFIG_NF_TABLES_BRIDGE=m
248248
CONFIG_NFT_BRIDGE_META=m
249249
CONFIG_NFT_BRIDGE_REJECT=m
250-
CONFIG_NF_LOG_BRIDGE=m
251250
CONFIG_NF_CONNTRACK_BRIDGE=m
252251
CONFIG_BRIDGE_NF_EBTABLES=m
253252
CONFIG_BRIDGE_EBT_BROUTE=m
@@ -530,6 +529,7 @@ CONFIG_CRYPTO_TEST=m
530529
CONFIG_CRYPTO_RSA=m
531530
CONFIG_CRYPTO_DH=m
532531
CONFIG_CRYPTO_ECDH=m
532+
CONFIG_CRYPTO_ECDSA=m
533533
CONFIG_CRYPTO_ECRDSA=m
534534
CONFIG_CRYPTO_SM2=m
535535
CONFIG_CRYPTO_CURVE25519=m
@@ -594,6 +594,7 @@ CONFIG_KUNIT_ALL_TESTS=m
594594
CONFIG_TEST_LIST_SORT=m
595595
CONFIG_TEST_MIN_HEAP=m
596596
CONFIG_TEST_SORT=m
597+
CONFIG_TEST_DIV64=m
597598
CONFIG_REED_SOLOMON_TEST=m
598599
CONFIG_ATOMIC64_SELFTEST=m
599600
CONFIG_ASYNC_RAID6_TEST=m

0 commit comments

Comments
 (0)