* linux-next: manual merge of the devsec-tsm tree with the devsec-tsm-fixes tree
@ 2025-05-08 7:25 Stephen Rothwell
2025-05-09 0:32 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-08 7:25 UTC (permalink / raw)
To: Dan Williams, sathyanarayanan.kuppuswamy, yilun.xu, sameo, aik,
suzuki.poulose, steven.price, lukas
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Hi all,
Today's linux-next merge of the devsec-tsm tree got a conflict in:
drivers/virt/coco/guest/report.c
between commit:
99b9d909187a ("configfs-tsm-report: Fix NULL dereference of tsm_ops")
(the file is drivers/virt/coco/tsm.c there)
from the devsec-tsm-fixes tree and commit:
e5ab985f1416 ("Merge branch 'for-6.16/tsm' into tsm-next")
from the devsec-tsm 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 devsec-tsm tree with the devsec-tsm-fixes tree
2025-05-08 7:25 linux-next: manual merge of the devsec-tsm tree with the devsec-tsm-fixes tree Stephen Rothwell
@ 2025-05-09 0:32 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2025-05-09 0:32 UTC (permalink / raw)
To: Stephen Rothwell, Dan Williams, sathyanarayanan.kuppuswamy,
yilun.xu, sameo, aik, suzuki.poulose, steven.price, lukas
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the devsec-tsm tree got a conflict in:
>
> drivers/virt/coco/guest/report.c
>
> between commit:
>
> 99b9d909187a ("configfs-tsm-report: Fix NULL dereference of tsm_ops")
> (the file is drivers/virt/coco/tsm.c there)
>
> from the devsec-tsm-fixes tree and commit:
>
> e5ab985f1416 ("Merge branch 'for-6.16/tsm' into tsm-next")
>
> from the devsec-tsm 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.
Looks like I flubbed this, will fix.
Thanks Stephen!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-05-09 0:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-05-08 7:25 linux-next: manual merge of the devsec-tsm tree with the devsec-tsm-fixes tree Stephen Rothwell
2025-05-09 0:32 ` Dan Williams
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®