Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Oct 2024 18:05:06 +1100

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/ufs/core/ufs-mcq.c

between commit:

  bf0c6cc73f7f ("scsi: ufs: core: Fix the issue of ICU failure")

from Linus' tree and commit:

  2c73fb138da5 ("scsi: ufs: core: Improve ufshcd_mcq_sq_cleanup()")

from the scsi-mkp tree.

I fixed it up (see below - I used the former version of the logging
change) 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/ufs-mcq.c
index dba935c712d6,988400500560..000000000000
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@@ -569,11 -569,10 +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);