Merge branch 6.18/scsi-fixes into 6.19/scsi-staging

Pull in fixes branch to resolve UFS merge conflict.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/scsi_error.c
Simple merge

diff --cc drivers/ufs/core/ufs-sysfs.c
Simple merge

diff --cc drivers/ufs/core/ufshcd.c
index 8d41f17f7796e80c3885c907d8a8ae7b87464d03,d6a060a7246186b838171e68435cce49bc0e1a44..8f68e305e83c3092acb3e47652e24a4cbd5a0f74
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -10939,8 -10882,12 +10940,8 @@@ initialized
        if (err)
                goto out_disable;
  
-       async_schedule(ufshcd_async_scan, hba);
 -      err = ufshcd_add_scsi_host(hba);
 -      if (err)
 -              goto out_disable;
 -
        ufs_sysfs_add_nodes(hba->dev);
+       async_schedule(ufshcd_async_scan, hba);
  
        device_enable_async_suspend(dev);
        ufshcd_pm_qos_init(hba);

diff --cc drivers/ufs/host/ufs-qcom.c
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge

diff --cc include/ufs/ufshcd.h
Simple merge