Commit 4a21d1b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d61f1cc5 aaf4e923

arch/m68k/configs/amiga_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 
CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_L2TP=m
@@ -281,7 +280,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -583,6 +581,7 @@ CONFIG_CRYPTO_AEGIS128=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA1=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

arch/m68k/configs/apollo_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 
CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_L2TP=m
@@ -277,7 +276,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -540,6 +538,7 @@ CONFIG_CRYPTO_AEGIS128=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA1=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

arch/m68k/configs/atari_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 
CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_L2TP=m
@@ -284,7 +283,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -560,6 +558,7 @@ CONFIG_CRYPTO_AEGIS128=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA1=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

arch/m68k/configs/bvme6000_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 
CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_L2TP=m
@@ -274,7 +273,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -532,6 +530,7 @@ CONFIG_CRYPTO_AEGIS128=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA1=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m

arch/m68k/configs/hp300_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ CONFIG_BRIDGE_EBT_SNAT=m 
CONFIG_BRIDGE_EBT_LOG=m

CONFIG_BRIDGE_EBT_NFLOG=m

CONFIG_IP_SCTP=m

CONFIG_SCTP_COOKIE_HMAC_SHA1=y

CONFIG_RDS=m

CONFIG_RDS_TCP=m

CONFIG_L2TP=m
@@ -276,7 +275,6 @@ CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m 
CONFIG_DNS_RESOLVER=y

CONFIG_BATMAN_ADV=m

# CONFIG_BATMAN_ADV_BATMAN_V is not set

CONFIG_BATMAN_ADV_NC=y

CONFIG_NETLINK_DIAG=m

CONFIG_MPLS=y

CONFIG_NET_MPLS_GSO=m
@@ -542,6 +540,7 @@ CONFIG_CRYPTO_AEGIS128=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA1=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_XCBC=m