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

Commit Message

Stephen Rothwell Sept. 21, 2020, 2:36 a.m. UTC

Hi all,

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

  drivers/crypto/Kconfig

between commit:

  bfe8fe939a04 ("crypto: sa2ul - add Kconfig selects to fix build error")

from Linus' tree and commit:

  61f033ba18c3 ("crypto: sa2ul - Select CRYPTO_AUTHENC")

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 drivers/crypto/Kconfig
index 52a9b7cf6576,c2950127def6..000000000000
--- a/drivers/crypto/Kconfig