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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <681d4d1ab7cb5_1229d6294d6@dwillia2-xfh.jf.intel.com.notmuch>
Date: Thu, 8 May 2025 17:32:26 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Dan Williams
	<dan.j.williams@...el.com>, <sathyanarayanan.kuppuswamy@...ux.intel.com>,
	<yilun.xu@...el.com>, <sameo@...osinc.com>, <aik@....com>,
	<suzuki.poulose@....com>, <steven.price@....com>, <lukas@...ner.de>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, "Linux Next
 Mailing List" <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the devsec-tsm tree with the
 devsec-tsm-fixes tree

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!