* linux-next: manual merge of the libcrypto tree with the libcrypto-fixes tree
@ 2025-07-01 2:30 Stephen Rothwell
2025-07-11 4:42 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-07-01 2:30 UTC (permalink / raw)
To: Eric Biggers, Jason A. Donenfeld, Ard Biesheuvel
Cc: Linux Crypto List, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the libcrypto tree with the libcrypto-fixes tree
2025-07-01 2:30 linux-next: manual merge of the libcrypto tree with the libcrypto-fixes tree Stephen Rothwell
@ 2025-07-11 4:42 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-07-11 4:42 UTC (permalink / raw)
To: Eric Biggers, Jason A. Donenfeld, Ard Biesheuvel
Cc: Linux Crypto List, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
Hi all,
On Tue, 1 Jul 2025 12:30:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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")
The above is now commit
68279380266a ("crypto: s390/sha - Fix uninitialized variable in SHA-1 and SHA-2")
in Linus' tree.
> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-11 4:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-01 2:30 linux-next: manual merge of the libcrypto tree with the libcrypto-fixes tree Stephen Rothwell
2025-07-11 4:42 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).