[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <75eb024e36162cc3a1007ff6b4ca4a3d8d0caa02.camel@HansenPartnership.com>
Date: Thu, 07 Nov 2024 16:00:24 -0500
From: James Bottomley <James.Bottomley@...senPartnership.com>
To: "Martin K. Petersen" <martin.petersen@...cle.com>, Stephen Rothwell
<sfr@...b.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the scsi-mkp tree
On Thu, 2024-11-07 at 15:47 -0500, Martin K. Petersen wrote:
>
> Hi Stephen!
>
> > 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
>
> Hrm, I believe I already addressed this conflict in the SCSI tree.
>
> Maybe James' repo has stale bits?
No, my tree builds ... or at least the ufs-mcq.c part of it (I checked
after I got the merge conflict ... although only with the default
configuration). I'm still worried about the resolution I flagged on
the list, though.
Regards,
James
Powered by blists - more mailing lists