From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>
Cc: Bart Van Assche <bvanassche@acm•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Peter Wang <peter.wang@mediatek•com>
Subject: linux-next: manual merge of the scsi-mkp tree with Linus' tree
Date: Mon, 28 Oct 2024 18:05:06 +1100 [thread overview]
Message-ID: <20241028180506.0ec4d6fc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1546 bytes --]
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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-28 7:05 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-28 7:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-14 3:36 linux-next: manual merge of the scsi-mkp tree with Linus' tree Stephen Rothwell
2025-11-14 16:31 ` Bart Van Assche
2025-03-21 5:47 Stephen Rothwell
2025-03-21 16:29 ` Bart Van Assche
2025-03-23 20:23 ` Stephen Rothwell
2024-07-09 6:57 Stephen Rothwell
2024-07-11 2:26 ` Martin K. Petersen
2023-08-28 3:02 Stephen Rothwell
2023-09-01 0:23 ` Karan Tilak Kumar (kartilak)
2023-03-20 1:16 Stephen Rothwell
2022-02-14 3:29 Stephen Rothwell
2022-02-14 8:57 ` John Garry
2021-12-08 3:32 Stephen Rothwell
2021-10-06 4:44 Stephen Rothwell
2021-08-11 5:40 Stephen Rothwell
2021-08-11 5:53 ` Sreekanth Reddy
2021-08-12 3:25 ` Martin K. Petersen
2020-09-03 5:21 Stephen Rothwell
2020-09-02 5:15 Stephen Rothwell
2020-09-02 5:12 Stephen Rothwell
2020-09-11 4:47 ` Stephen Rothwell
2020-06-10 2:17 Stephen Rothwell
2020-06-11 2:12 ` Stephen Rothwell
2019-02-11 4:31 Stephen Rothwell
2019-02-11 9:24 ` John Garry
2019-02-07 4:44 Stephen Rothwell
2019-02-07 18:30 ` James Smart
2018-12-10 6:17 Stephen Rothwell
2018-12-10 7:09 ` Stephen Rothwell
2018-10-18 4:15 Stephen Rothwell
2018-08-03 6:22 Stephen Rothwell
2018-08-03 6:04 Stephen Rothwell
2018-07-11 4:04 Stephen Rothwell
2018-07-12 4:29 ` Stephen Rothwell
2018-03-22 5:54 Stephen Rothwell
2017-11-30 1:51 Stephen Rothwell
2017-11-30 1:55 ` Stephen Rothwell
2017-12-01 2:14 ` Martin K. Petersen
2017-12-01 3:42 ` Stephen Rothwell
2017-09-01 4:48 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241028180506.0ec4d6fc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bvanassche@acm$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=peter.wang@mediatek$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox