Skip to content

Commit 4a21d1b

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven: - defconfig update * tag 'm68k-for-v6.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.18-rc1
2 parents d61f1cc + aaf4e92 commit 4a21d1b

12 files changed

Lines changed: 12 additions & 24 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
265265
CONFIG_BRIDGE_EBT_LOG=m
266266
CONFIG_BRIDGE_EBT_NFLOG=m
267267
CONFIG_IP_SCTP=m
268-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
269268
CONFIG_RDS=m
270269
CONFIG_RDS_TCP=m
271270
CONFIG_L2TP=m
@@ -281,7 +280,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
281280
CONFIG_DNS_RESOLVER=y
282281
CONFIG_BATMAN_ADV=m
283282
# CONFIG_BATMAN_ADV_BATMAN_V is not set
284-
CONFIG_BATMAN_ADV_NC=y
285283
CONFIG_NETLINK_DIAG=m
286284
CONFIG_MPLS=y
287285
CONFIG_NET_MPLS_GSO=m
@@ -583,6 +581,7 @@ CONFIG_CRYPTO_AEGIS128=m
583581
CONFIG_CRYPTO_MD4=m
584582
CONFIG_CRYPTO_MICHAEL_MIC=m
585583
CONFIG_CRYPTO_RMD160=m
584+
CONFIG_CRYPTO_SHA1=m
586585
CONFIG_CRYPTO_SM3_GENERIC=m
587586
CONFIG_CRYPTO_WP512=m
588587
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
261261
CONFIG_BRIDGE_EBT_LOG=m
262262
CONFIG_BRIDGE_EBT_NFLOG=m
263263
CONFIG_IP_SCTP=m
264-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
265264
CONFIG_RDS=m
266265
CONFIG_RDS_TCP=m
267266
CONFIG_L2TP=m
@@ -277,7 +276,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
277276
CONFIG_DNS_RESOLVER=y
278277
CONFIG_BATMAN_ADV=m
279278
# CONFIG_BATMAN_ADV_BATMAN_V is not set
280-
CONFIG_BATMAN_ADV_NC=y
281279
CONFIG_NETLINK_DIAG=m
282280
CONFIG_MPLS=y
283281
CONFIG_NET_MPLS_GSO=m
@@ -540,6 +538,7 @@ CONFIG_CRYPTO_AEGIS128=m
540538
CONFIG_CRYPTO_MD4=m
541539
CONFIG_CRYPTO_MICHAEL_MIC=m
542540
CONFIG_CRYPTO_RMD160=m
541+
CONFIG_CRYPTO_SHA1=m
543542
CONFIG_CRYPTO_SM3_GENERIC=m
544543
CONFIG_CRYPTO_WP512=m
545544
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
268268
CONFIG_BRIDGE_EBT_LOG=m
269269
CONFIG_BRIDGE_EBT_NFLOG=m
270270
CONFIG_IP_SCTP=m
271-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
272271
CONFIG_RDS=m
273272
CONFIG_RDS_TCP=m
274273
CONFIG_L2TP=m
@@ -284,7 +283,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
284283
CONFIG_DNS_RESOLVER=y
285284
CONFIG_BATMAN_ADV=m
286285
# CONFIG_BATMAN_ADV_BATMAN_V is not set
287-
CONFIG_BATMAN_ADV_NC=y
288286
CONFIG_NETLINK_DIAG=m
289287
CONFIG_MPLS=y
290288
CONFIG_NET_MPLS_GSO=m
@@ -560,6 +558,7 @@ CONFIG_CRYPTO_AEGIS128=m
560558
CONFIG_CRYPTO_MD4=m
561559
CONFIG_CRYPTO_MICHAEL_MIC=m
562560
CONFIG_CRYPTO_RMD160=m
561+
CONFIG_CRYPTO_SHA1=m
563562
CONFIG_CRYPTO_SM3_GENERIC=m
564563
CONFIG_CRYPTO_WP512=m
565564
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
258258
CONFIG_BRIDGE_EBT_LOG=m
259259
CONFIG_BRIDGE_EBT_NFLOG=m
260260
CONFIG_IP_SCTP=m
261-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
262261
CONFIG_RDS=m
263262
CONFIG_RDS_TCP=m
264263
CONFIG_L2TP=m
@@ -274,7 +273,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
274273
CONFIG_DNS_RESOLVER=y
275274
CONFIG_BATMAN_ADV=m
276275
# CONFIG_BATMAN_ADV_BATMAN_V is not set
277-
CONFIG_BATMAN_ADV_NC=y
278276
CONFIG_NETLINK_DIAG=m
279277
CONFIG_MPLS=y
280278
CONFIG_NET_MPLS_GSO=m
@@ -532,6 +530,7 @@ CONFIG_CRYPTO_AEGIS128=m
532530
CONFIG_CRYPTO_MD4=m
533531
CONFIG_CRYPTO_MICHAEL_MIC=m
534532
CONFIG_CRYPTO_RMD160=m
533+
CONFIG_CRYPTO_SHA1=m
535534
CONFIG_CRYPTO_SM3_GENERIC=m
536535
CONFIG_CRYPTO_WP512=m
537536
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
260260
CONFIG_BRIDGE_EBT_LOG=m
261261
CONFIG_BRIDGE_EBT_NFLOG=m
262262
CONFIG_IP_SCTP=m
263-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
264263
CONFIG_RDS=m
265264
CONFIG_RDS_TCP=m
266265
CONFIG_L2TP=m
@@ -276,7 +275,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
276275
CONFIG_DNS_RESOLVER=y
277276
CONFIG_BATMAN_ADV=m
278277
# CONFIG_BATMAN_ADV_BATMAN_V is not set
279-
CONFIG_BATMAN_ADV_NC=y
280278
CONFIG_NETLINK_DIAG=m
281279
CONFIG_MPLS=y
282280
CONFIG_NET_MPLS_GSO=m
@@ -542,6 +540,7 @@ CONFIG_CRYPTO_AEGIS128=m
542540
CONFIG_CRYPTO_MD4=m
543541
CONFIG_CRYPTO_MICHAEL_MIC=m
544542
CONFIG_CRYPTO_RMD160=m
543+
CONFIG_CRYPTO_SHA1=m
545544
CONFIG_CRYPTO_SM3_GENERIC=m
546545
CONFIG_CRYPTO_WP512=m
547546
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
259259
CONFIG_BRIDGE_EBT_LOG=m
260260
CONFIG_BRIDGE_EBT_NFLOG=m
261261
CONFIG_IP_SCTP=m
262-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
263262
CONFIG_RDS=m
264263
CONFIG_RDS_TCP=m
265264
CONFIG_L2TP=m
@@ -275,7 +274,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
275274
CONFIG_DNS_RESOLVER=y
276275
CONFIG_BATMAN_ADV=m
277276
# CONFIG_BATMAN_ADV_BATMAN_V is not set
278-
CONFIG_BATMAN_ADV_NC=y
279277
CONFIG_NETLINK_DIAG=m
280278
CONFIG_MPLS=y
281279
CONFIG_NET_MPLS_GSO=m
@@ -559,6 +557,7 @@ CONFIG_CRYPTO_AEGIS128=m
559557
CONFIG_CRYPTO_MD4=m
560558
CONFIG_CRYPTO_MICHAEL_MIC=m
561559
CONFIG_CRYPTO_RMD160=m
560+
CONFIG_CRYPTO_SHA1=m
562561
CONFIG_CRYPTO_SM3_GENERIC=m
563562
CONFIG_CRYPTO_WP512=m
564563
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
279279
CONFIG_BRIDGE_EBT_LOG=m
280280
CONFIG_BRIDGE_EBT_NFLOG=m
281281
CONFIG_IP_SCTP=m
282-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
283282
CONFIG_RDS=m
284283
CONFIG_RDS_TCP=m
285284
CONFIG_L2TP=m
@@ -295,7 +294,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
295294
CONFIG_DNS_RESOLVER=y
296295
CONFIG_BATMAN_ADV=m
297296
# CONFIG_BATMAN_ADV_BATMAN_V is not set
298-
CONFIG_BATMAN_ADV_NC=y
299297
CONFIG_NETLINK_DIAG=m
300298
CONFIG_MPLS=y
301299
CONFIG_NET_MPLS_GSO=m
@@ -646,6 +644,7 @@ CONFIG_CRYPTO_AEGIS128=m
646644
CONFIG_CRYPTO_MD4=m
647645
CONFIG_CRYPTO_MICHAEL_MIC=m
648646
CONFIG_CRYPTO_RMD160=m
647+
CONFIG_CRYPTO_SHA1=m
649648
CONFIG_CRYPTO_SM3_GENERIC=m
650649
CONFIG_CRYPTO_WP512=m
651650
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
257257
CONFIG_BRIDGE_EBT_LOG=m
258258
CONFIG_BRIDGE_EBT_NFLOG=m
259259
CONFIG_IP_SCTP=m
260-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
261260
CONFIG_RDS=m
262261
CONFIG_RDS_TCP=m
263262
CONFIG_L2TP=m
@@ -273,7 +272,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
273272
CONFIG_DNS_RESOLVER=y
274273
CONFIG_BATMAN_ADV=m
275274
# CONFIG_BATMAN_ADV_BATMAN_V is not set
276-
CONFIG_BATMAN_ADV_NC=y
277275
CONFIG_NETLINK_DIAG=m
278276
CONFIG_MPLS=y
279277
CONFIG_NET_MPLS_GSO=m
@@ -532,6 +530,7 @@ CONFIG_CRYPTO_AEGIS128=m
532530
CONFIG_CRYPTO_MD4=m
533531
CONFIG_CRYPTO_MICHAEL_MIC=m
534532
CONFIG_CRYPTO_RMD160=m
533+
CONFIG_CRYPTO_SHA1=m
535534
CONFIG_CRYPTO_SM3_GENERIC=m
536535
CONFIG_CRYPTO_WP512=m
537536
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
258258
CONFIG_BRIDGE_EBT_LOG=m
259259
CONFIG_BRIDGE_EBT_NFLOG=m
260260
CONFIG_IP_SCTP=m
261-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
262261
CONFIG_RDS=m
263262
CONFIG_RDS_TCP=m
264263
CONFIG_L2TP=m
@@ -274,7 +273,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
274273
CONFIG_DNS_RESOLVER=y
275274
CONFIG_BATMAN_ADV=m
276275
# CONFIG_BATMAN_ADV_BATMAN_V is not set
277-
CONFIG_BATMAN_ADV_NC=y
278276
CONFIG_NETLINK_DIAG=m
279277
CONFIG_MPLS=y
280278
CONFIG_NET_MPLS_GSO=m
@@ -533,6 +531,7 @@ CONFIG_CRYPTO_AEGIS128=m
533531
CONFIG_CRYPTO_MD4=m
534532
CONFIG_CRYPTO_MICHAEL_MIC=m
535533
CONFIG_CRYPTO_RMD160=m
534+
CONFIG_CRYPTO_SHA1=m
536535
CONFIG_CRYPTO_SM3_GENERIC=m
537536
CONFIG_CRYPTO_WP512=m
538537
CONFIG_CRYPTO_XCBC=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
259259
CONFIG_BRIDGE_EBT_LOG=m
260260
CONFIG_BRIDGE_EBT_NFLOG=m
261261
CONFIG_IP_SCTP=m
262-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
263262
CONFIG_RDS=m
264263
CONFIG_RDS_TCP=m
265264
CONFIG_L2TP=m
@@ -275,7 +274,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
275274
CONFIG_DNS_RESOLVER=y
276275
CONFIG_BATMAN_ADV=m
277276
# CONFIG_BATMAN_ADV_BATMAN_V is not set
278-
CONFIG_BATMAN_ADV_NC=y
279277
CONFIG_NETLINK_DIAG=m
280278
CONFIG_MPLS=y
281279
CONFIG_NET_MPLS_GSO=m
@@ -549,6 +547,7 @@ CONFIG_CRYPTO_AEGIS128=m
549547
CONFIG_CRYPTO_MD4=m
550548
CONFIG_CRYPTO_MICHAEL_MIC=m
551549
CONFIG_CRYPTO_RMD160=m
550+
CONFIG_CRYPTO_SHA1=m
552551
CONFIG_CRYPTO_SM3_GENERIC=m
553552
CONFIG_CRYPTO_WP512=m
554553
CONFIG_CRYPTO_XCBC=m

0 commit comments

Comments
 (0)