Messages in this thread | | | Date | Mon, 21 Sep 2020 12:36:19 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the crypto tree with Linus' tree |
| |
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.
-- Cheers, Stephen Rothwell
diff --cc drivers/crypto/Kconfig index 52a9b7cf6576,c2950127def6..000000000000 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@@ -873,9 -873,7 +873,10 @@@ config CRYPTO_DEV_SA2U select CRYPTO_AES select CRYPTO_AES_ARM64 select CRYPTO_ALGAPI + select CRYPTO_AUTHENC + select CRYPTO_SHA1 + select CRYPTO_SHA256 + select CRYPTO_SHA512 select HW_RANDOM select SG_SPLIT help [unhandled content-type:application/pgp-signature] | |