linux-kernel - 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20251114143636.607c0bdd@canb.auug.org.au>
Date: Fri, 14 Nov 2025 14:36:36 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@...cle.com>
Cc: Bart Van Assche <bvanassche@....org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/ufs/core/ufshcd.c
index c76d8c65ef46,ca17165f6f0e..000000000000
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -10892,12 -10939,8 +10940,8 @@@ initialized
  	if (err)
  		goto out_disable;

- 	err = ufshcd_add_scsi_host(hba);
- 	if (err)
- 		goto out_disable;
- 
 -	async_schedule(ufshcd_async_scan, hba);
  	ufs_sysfs_add_nodes(hba->dev);
 +	async_schedule(ufshcd_async_scan, hba);

  	device_enable_async_suspend(dev);
  	ufshcd_pm_qos_init(hba);

Content of type "application/pgp-signature" skipped