Commit 15f90423 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v6.0-rc2 



  - Drop CONFIG_NF_CONNTRACK_PROCFS=n (no longer auto-enabled since
    commit aa5762c3 ("netfilter: conntrack: NF_CONNTRACK_PROCFS
    should no longer default to y")),
  - Enable modular build of the new HCTR2 and ARIA crypto algorithms,
  - Drop CONFIG_CRYPTO_BLAKE2S=m (removed in commit 2d16803c
    ("crypto blake2s - remove shash module")).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/01a6abf7bc23a478d6a6c6801c6812ae96714620.1660559393.git.geert@linux-m68k.org
Link: https://lore.kernel.org/r/1fbe623e5d69bdce0352445c06e1b2c9fb8d123e.1661767119.git.geert@linux-m68k.org
parent d355a08e

arch/m68k/configs/amiga_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -573,9 +572,9 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -594,6 +593,7 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

arch/m68k/configs/apollo_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -530,9 +529,9 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -551,6 +550,7 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

arch/m68k/configs/atari_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -550,9 +549,9 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -571,6 +570,7 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

arch/m68k/configs/bvme6000_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -522,9 +521,9 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -543,6 +542,7 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m

arch/m68k/configs/hp300_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ CONFIG_NETFILTER=y 
CONFIG_NETFILTER_NETLINK_HOOK=m

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_ZONES=y

# CONFIG_NF_CONNTRACK_PROCFS is not set

# CONFIG_NF_CT_PROTO_DCCP is not set

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m
@@ -532,9 +531,9 @@ CONFIG_CRYPTO_PCBC=m 
CONFIG_CRYPTO_XTS=m

CONFIG_CRYPTO_KEYWRAP=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_HCTR2=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m
@@ -553,6 +552,7 @@ CONFIG_CRYPTO_DES=m 
CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SEED=m

CONFIG_CRYPTO_ARIA=m

CONFIG_CRYPTO_SERPENT=m

CONFIG_CRYPTO_SM4_GENERIC=m

CONFIG_CRYPTO_TEA=m