linux-next: manual merge of the devsec-tsm tree with the devsec-tsm-fixes tree

[Stephen Rothwell]

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: pgpVLfElIzzdA.pgp
Description: OpenPGP digital signature