* linux-next: manual merge of the crc tree with the s390 tree
@ 2025-06-18 4:47 Stephen Rothwell
2025-07-29 23:06 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-06-18 4:47 UTC (permalink / raw)
To: Eric Biggers, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger
Cc: Alexander Gordeev, Eric Biggers, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
Hi all,
Today's linux-next merge of the crc tree got a conflict in:
lib/crc/s390/crc32.h
between commit:
65c9a9f92502 ("s390: Explicitly include <linux/export.h>")
from the s390 tree and commit:
47e6269f497a ("lib/crc/s390: migrate s390-optimized CRC code into lib/crc/")
from the crc tree.
I fixed it up (I just used the latter version) 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 crc tree with the s390 tree
2025-06-18 4:47 linux-next: manual merge of the crc tree with the s390 tree Stephen Rothwell
@ 2025-07-29 23:06 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-07-29 23:06 UTC (permalink / raw)
To: Eric Biggers, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger
Cc: Alexander Gordeev, Eric Biggers, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
Hi all,
On Wed, 18 Jun 2025 14:47:50 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the crc tree got a conflict in:
>
> lib/crc/s390/crc32.h
>
> between commit:
>
> 65c9a9f92502 ("s390: Explicitly include <linux/export.h>")
>
> from the s390 tree and commit:
>
> 47e6269f497a ("lib/crc/s390: migrate s390-optimized CRC code into lib/crc/")
>
> from the crc tree.
>
> I fixed it up (I just used the latter version) 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.
This is now a conflict between the s390 tree and Linus' tree.
--
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-29 23:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-18 4:47 linux-next: manual merge of the crc tree with the s390 tree Stephen Rothwell
2025-07-29 23:06 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox