diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-08-29 13:00:39 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-09-19 11:43:14 +0300 |
| commit | 15f9042311b0ab9c2904d50428f304a6229d6a02 (patch) | |
| tree | ebefe3b3ea09685a19ce18198ec45faea11a5c2a /arch/m68k/configs/multi_defconfig | |
| parent | d355a08e28691cc057f851a3cf9bf016bdfb3c39 (diff) | |
| download | linux-15f9042311b0ab9c2904d50428f304a6229d6a02.tar.xz | |
m68k: defconfig: Update defconfigs for v6.0-rc2
- Drop CONFIG_NF_CONNTRACK_PROCFS=n (no longer auto-enabled since
commit aa5762c34213aba7 ("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 2d16803c562ecc64
("crypto blake2s - remove shash module")).
Signed-off-by: Geert 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
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 9f45fe60757f..f5f4c572b694 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -98,7 +98,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 @@ -638,9 +637,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 @@ -659,6 +658,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 |