Subject: linux-next: manual merge of the crypto tree with the arm-soc-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 May 2025 13:54:26 +1000

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm64/configs/defconfig

between commit:

  6c9ab811871b ("arm64: defconfig: Ensure CRYPTO_CHACHA20_NEON is selected")

from the arm-soc-fixes tree and commit:

  3357b6c94569 ("crypto: tcrypt - rename CRYPTO_TEST to CRYPTO_BENCHMARK")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/configs/defconfig
index e0d6ac7fd91a,4166bc4d3cec..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1724,15 -1729,14 +1724,14 @@@ CONFIG_NLS_CODEPAGE_437=
  CONFIG_NLS_ISO8859_1=y
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_USER=y
 +CONFIG_CRYPTO_CHACHA20=m
- CONFIG_CRYPTO_TEST=m
+ CONFIG_CRYPTO_BENCHMARK=m
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_MICHAEL_MIC=m
  CONFIG_CRYPTO_ANSI_CPRNG=y
  CONFIG_CRYPTO_USER_API_RNG=m
 -CONFIG_CRYPTO_CHACHA20_NEON=m
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
  CONFIG_CRYPTO_SHA1_ARM64_CE=y
- CONFIG_CRYPTO_SHA2_ARM64_CE=y
  CONFIG_CRYPTO_SHA512_ARM64_CE=m
  CONFIG_CRYPTO_SHA3_ARM64=m
  CONFIG_CRYPTO_SM3_ARM64_CE=m