linux-kernel - Re: linux-next: manual merge of the scsi-mkp tree with Linus' 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: <5e080129-7c4e-4a0c-9c48-ad7f33262638@acm.org>
Date: Fri, 14 Nov 2025 08:31:12 -0800
From: Bart Van Assche <bvanassche@....org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 "Martin K. Petersen" <martin.petersen@...cle.com>
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 scsi-mkp tree with Linus' tree

On 11/13/25 7:36 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
> 
>    drivers/ufs/core/ufshcd.c
> 
> between commit:
> 
>    c74dc8ab47c1 ("scsi: ufs: core: Fix a race condition related to the "hid" attribute group")
> 
> from Linus' tree and commit:
> 
>    f46b9a595fa9 ("scsi: ufs: core: Allocate the SCSI host earlier")
> 
> from the scsi-mkp tree.
> 
> I fixed it up (see below) 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.

Thanks Stephen for having resolved this merge conflict. The conflict
resolution looks good to me.

Thanks,

Bart.