Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging

Pull in 6.12 fixes branch to resolve a merge conflict in ufs-mcq.c.

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

diff --cc drivers/ufs/core/ufs-mcq.c
index 9884005005605cb4a8b578a6c5b9962b7f6a16b4,3903947dbed1ca785def0d2d357af102eb638089..24c10e62cef9ffe3f4fbced1e9178c510d289bb1
--- 1/drivers/ufs/core/ufs-mcq.c
--- 2/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@@ -569,10 -569,11 +569,11 @@@ int ufshcd_mcq_sq_cleanup(struct ufs_hb
        opr_sqd_base = mcq_opr_base(hba, OPR_SQD, id);
        writel(nexus, opr_sqd_base + REG_SQCTI);
  
-       /* SQRTCy.ICU = 1 */
-       writel(SQ_ICU, opr_sqd_base + REG_SQRTC);
+       /* Initiate Cleanup */
+       writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU,
+               opr_sqd_base + REG_SQRTC);
  
 -      /* Poll SQRTSy.CUS = 1. Return result from SQRTSy.RTC */
 +      /* Wait until SQRTSy.CUS = 1. Report SQRTSy.RTC. */
        reg = opr_sqd_base + REG_SQRTS;
        err = read_poll_timeout(readl, val, val & SQ_CUS, 20,
                                MCQ_POLL_US, false, reg);

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