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
Hi all,
Today's linux-next merge of the crypto tree got conflicts in:
drivers/crypto/vmx/aes.c
drivers/crypto/vmx/aes_cbc.c
drivers/crypto/vmx/aes_ctr.c
drivers/crypto/vmx/aes_xts.c
drivers/crypto/vmx/vmx.c
between commits:
64d85cc99980 ("treewide: Replace GPLv2 boilerplate/referenc
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in:
crypto/crypto_wq.c
between commit:
2874c5fd2842 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
152")
from Linus' tree and commit:
3e56e168638b ("crypto: cryptd - move kcrypto_wq into cryptd")
On Fri, May 09, 2014 at 12:07:02PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
>
> Today's linux-next merge of the crypto tree got a conflict in
> crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
> netlink_ns_capable to verify the permisions of netlink messages") from
> Linus' tree and
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
netlink_ns_capable to verify the permisions of netlink messages") from
Linus' tree and commit c568398aa05f ("crypto: user - Allow
CRYPTO_MSG_GETALG without CAP_NET_
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
drivers/crypto/bfin_crc.h between commit 3356c99ea392 ("bfin_crc: Move
architecture independant crc header file out of the blackfin folder")
from Linus' tree and commit 52e6e543f2d8 ("crypto: bfin_crc - access crc
registers
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from Linus' tree and commits
020016183453 ("hwrng: Turn HW_RANDOM into a menuconfig") and 2d9cab5194c8
("hwrng: F
10 matches
Mail list logo
