* linux-next: manual merge of the kspp tree with the mm-hotfixes tree
@ 2025-04-16 4:51 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-04-16 4:51 UTC (permalink / raw)
To: Kees Cook, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Mostafa Saleh
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
lib/test_ubsan.c
between commit:
22dd91185686 ("lib/test_ubsan.c: fix panic from test_ubsan_out_of_bounds")
from the mm-hotfixes-unstable branch of the mm-hotfixes tree and commit:
9b044614be12 ("ubsan: Fix panic from test_ubsan_out_of_bounds")
from the kspp 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] only message in thread
only message in thread, other threads:[~2025-04-16 4:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-16 4:51 linux-next: manual merge of the kspp tree with the mm-hotfixes tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®