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
Hi all,
Today's linux-next merge of the crypto tree got conflicts in:
crypto/lrw.c
crypto/xts.c
between commit:
1a263ae60b04 ("gcc-10: avoid shadowing standard library 'free()' in crypto")
from Linus' tree and commit:
d099ea6e6fde ("crypto - Avoid free() namespace collision")
from th
LGTM, sorry for the mid air collision. Thanks for resolving, Stephen!
On Thu, Aug 22, 2019 at 8:08 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the crypto tree got a conflict in:
>
> arch/x86/purgatory/Makefile
>
> between commit:
>
> 4ce97317f41d ("x86/purgatory: D
Hi all,
Today's linux-next merge of the crypto tree got a conflict in:
arch/x86/purgatory/Makefile
between commit:
4ce97317f41d ("x86/purgatory: Do not use __builtin_memcpy and
__builtin_memset")
from Linus' tree and commit:
ad767ee858b3 ("crypto: sha256 - Move lib/sha256.c to lib/cryp
