Merge patch series "UFS patches for kernel 6.11"

Bart Van Assche <bvanassche@acm.org> says:

Hi Martin,

Please consider this series of UFS driver patches for the next merge window.

Thank you,

Bart.

Link: https://lore.kernel.org/r/20240708211716.2827751-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

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

diff --cc drivers/ufs/core/ufshcd.c
index 5120f59b1d3de61e2acca6519c849c088abb159f,64f72937c0a290b8fcff0548818924ceba5467d1..0be3e9a089e870ecec0ae131f6c58d8c7164b512
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -6460,10 -6458,8 +6459,10 @@@ static bool ufshcd_abort_one(struct req
                *ret ? "failed" : "succeeded");
  
        /* Release cmd in MCQ mode if abort succeeds */
-       if (is_mcq_enabled(hba) && (*ret == 0)) {
+       if (hba->mcq_enabled && (*ret == 0)) {
                hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(lrbp->cmd));
 +              if (!hwq)
 +                      return 0;
                spin_lock_irqsave(&hwq->cq_lock, flags);
                if (ufshcd_cmd_inflight(lrbp->cmd))
                        ufshcd_release_scsi_cmd(hba, lrbp);

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