Hi all,
Today's linux-next merge of the libcrypto tree got a conflict in:
arch/s390/crypto/sha512_s390.c
between commit:
400bd45ba798 ("crypto: s390/sha - Fix uninitialized variable in SHA-1 and SHA-2")
from the libcrypto-fixes tree and commit:
b7b366087e0f ("lib/crypto: s390/sha512: Migrate optimized SHA-512 code to library")
from the libcrypto tree.
I fixed it up (I just deleted the file) 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
Attachment:
pgpfasrOtbCOg.pgp
Description: OpenPGP digital signature
