linux-kernel - linux-next: build failure after merge of the scsi-mkp tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241107212954.4da462cf@canb.auug.org.au>
Date: Thu, 7 Nov 2024 21:29:54 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@...cle.com>, James Bottomley
 <James.Bottomley@...senPartnership.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the scsi-mkp tree

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@...b.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@...b.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

Content of type "application/pgp-signature" skipped