From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle•com>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the scsi-mkp tree
Date: Thu, 7 Nov 2024 21:29:54 +1100 [thread overview]
Message-ID: <20241107212954.4da462cf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]
Hi all,
After merging the scsi-mkp tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/ufs/core/ufs-mcq.c: In function 'ufshcd_mcq_sq_cleanup':
drivers/ufs/core/ufs-mcq.c:580:9: error: 'rtc' undeclared (first use in this function)
580 | rtc = FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg));
| ^~~
drivers/ufs/core/ufs-mcq.c:580:9: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
bedea6f472ab ("Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git")
The automatic merge resolution didn't work out right.
I have applied the following fix up patch (that may be needed when the
scsi and scsi-mkp trees are merged):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 7 Nov 2024 21:21:01 +1100
Subject: [PATCH] bad automatic merge fixup for scsi-mkp merge
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/ufs/core/ufs-mcq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index fa25e9ac2804..18ca95e5b68c 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -539,7 +539,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag)
struct scsi_cmnd *cmd = lrbp->cmd;
struct ufs_hw_queue *hwq;
void __iomem *reg, *opr_sqd_base;
- u32 nexus, id, val;
+ u32 nexus, id, val, rtc;
int err;
if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_RTC)
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-11-07 10:29 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 10:29 Stephen Rothwell [this message]
2024-11-07 20:47 ` linux-next: build failure after merge of the scsi-mkp tree Martin K. Petersen
2024-11-07 21:00 ` James Bottomley
2024-11-07 21:31 ` Martin K. Petersen
2024-11-08 0:56 ` James Bottomley
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 5:46 Stephen Rothwell
2024-04-12 6:09 ` Christoph Hellwig
2024-04-12 10:22 ` Martin K. Petersen
2024-04-12 10:44 ` Martin K. Petersen
2024-03-27 2:45 Stephen Rothwell
2024-03-28 0:18 ` Martin K. Petersen
2023-08-22 5:32 Stephen Rothwell
2023-08-23 22:55 ` Stephen Rothwell
2023-08-23 22:59 ` Martin K. Petersen
2023-06-15 3:43 Stephen Rothwell
2023-06-15 4:19 ` Damien Le Moal
2023-06-16 16:51 ` Martin K. Petersen
2023-01-16 2:24 Stephen Rothwell
2023-01-16 17:55 ` Mike Christie
2023-01-16 18:07 ` Martin K. Petersen
2022-08-24 1:50 Stephen Rothwell
2022-08-29 4:54 ` Stephen Rothwell
2022-08-30 2:11 ` Martin K. Petersen
2022-04-27 3:38 Stephen Rothwell
2022-04-27 7:40 ` Sumit Saxena
2022-04-27 8:28 ` Stephen Rothwell
2021-08-17 9:47 Stephen Rothwell
2021-08-17 9:51 ` John Garry
2021-08-18 3:07 ` Bart Van Assche
2021-08-18 11:41 ` John Garry
2021-05-27 3:47 Stephen Rothwell
2021-03-12 3:17 Stephen Rothwell
2021-03-12 3:20 ` Jens Axboe
2021-01-25 4:13 Stephen Rothwell
2021-01-25 5:53 ` Douglas Gilbert
2021-01-27 7:01 ` Stephen Rothwell
2021-01-27 17:10 ` Douglas Gilbert
2020-12-08 9:28 Stephen Rothwell
2020-12-08 9:30 ` Christoph Hellwig
2020-12-08 10:01 ` Stephen Rothwell
2020-12-08 9:38 ` Stephen Rothwell
2020-12-08 17:55 ` Alan Stern
2020-12-08 19:56 ` Bart Van Assche
2020-07-21 6:30 Stephen Rothwell
2020-07-23 5:54 ` Stephen Rothwell
2020-07-23 15:01 ` Martin K. Petersen
2020-07-24 4:21 ` Kiwoong Kim
2020-01-22 4:10 Stephen Rothwell
2020-01-22 9:51 ` John Garry
2020-01-23 2:22 ` Martin K. Petersen
2019-10-25 3:07 Stephen Rothwell
2019-10-25 18:03 ` James Smart
2019-10-28 5:49 ` Stephen Rothwell
2019-10-29 2:28 ` Martin K. Petersen
2019-10-29 2:48 ` Stephen Rothwell
2019-04-09 6:27 Stephen Rothwell
2019-04-10 1:21 ` Stephen Rothwell
2019-04-10 1:33 ` Martin K. Petersen
2019-04-10 4:04 ` James Bottomley
2019-04-10 4:57 ` Stephen Rothwell
2018-03-22 6:25 Stephen Rothwell
2018-03-22 16:33 ` Madhani, Himanshu
2017-12-07 3:57 Stephen Rothwell
2017-12-07 3:59 ` Bart Van Assche
2017-12-07 4:25 ` Stephen Rothwell
2017-12-07 4:42 ` Paul E. McKenney
2017-12-07 17:30 ` Bart Van Assche
2017-12-07 17:40 ` Paul E. McKenney
2017-12-07 20:34 ` Stephen Rothwell
2017-12-07 21:10 ` Paul E. McKenney
2017-12-07 21:11 ` Martin K. Petersen
2017-12-08 1:00 ` Martin K. Petersen
2017-12-11 17:43 ` Paul E. McKenney
2017-05-17 2:57 Stephen Rothwell
2017-02-23 3:12 Stephen Rothwell
2017-02-23 14:19 ` Martin K. Petersen
2017-02-23 15:04 ` Chad Dupuis
2017-02-22 2:41 Stephen Rothwell
2017-02-22 21:06 ` Stephen Rothwell
2017-02-22 21:10 ` Martin K. Petersen
2017-02-22 21:13 ` James Bottomley
2017-02-22 21:17 ` Martin K. Petersen
2017-02-27 1:54 ` Stephen Rothwell
2017-02-27 15:25 ` James Bottomley
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=20241107212954.4da462cf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(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