Subject: linux-next: manual merge of the libcrypto tree with the crypto tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 24 Nov 2025 14:35:12 +1100

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  c7dcb041ce7d ("crypto: ansi_cprng - Remove unused ansi_cprng algorithm")

from the crypto tree and commit:

  1e29a750572a ("lib/crypto: arm64/sha3: Migrate optimized code into library")

from the libcrypto 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 ea054634d157,20dd3a39faea..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1868,9 -1783,10 +1868,9 @@@ CONFIG_CRYPTO_CHACHA20=
  CONFIG_CRYPTO_BENCHMARK=m
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_MICHAEL_MIC=m
+ CONFIG_CRYPTO_SHA3=m
 -CONFIG_CRYPTO_ANSI_CPRNG=y
  CONFIG_CRYPTO_USER_API_RNG=m
  CONFIG_CRYPTO_GHASH_ARM64_CE=y
- CONFIG_CRYPTO_SHA3_ARM64=m
  CONFIG_CRYPTO_SM3_ARM64_CE=m
  CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
  CONFIG_CRYPTO_AES_ARM64_BS=m