linux-next: manual merge of the crypto tree with Linus' tree

Commit Message

Stephen Rothwell Nov. 5, 2019, 2:23 a.m. UTC

Hi all,

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

  arch/arm/crypto/Kconfig

between commit:

  f703964fc668 ("crypto: arm/aes-ce - add dependency on AES library")

from Linus' tree and commits:

  b4d0c0aad57a ("crypto: arm - use Kconfig based compiler checks for crypto opcodes")
  b95bba5d0114 ("crypto: skcipher - rename the crypto_blkcipher module and kconfig option")

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.

Patch

diff --cc arch/arm/crypto/Kconfig
index 043b0b18bf7e,c618c379449f..000000000000
--- a/arch/arm/crypto/Kconfig