Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Darren Trapp <darren.trapp@cavium.com>,
	Himanshu Madhani <himanshu.madhani@cavium.com>,
	Quinn Tran <quinn.tran@cavium.com>
Subject: linux-next: build failure after merge of the scsi-mkp tree
Date: Thu, 22 Mar 2018 17:25:03 +1100
Message-ID: <20180322172503.2d8e72ef@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2637 bytes --]

Hi Martin,

After merging the scsi-mkp tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:7: error: 'fc4type' undeclared (first use in this function); did you mean 'fc4type_t'?
  if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
       ^~~~~~~
       fc4type_t
drivers/scsi/qla2xxx/qla_gs.c:3974:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/scsi/qla2xxx/qla_gs.c:3975:3: error: too few arguments to function 'qla24xx_async_gpnft'
   qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
   ^~~~~~~~~~~~~~~~~~~
In file included from drivers/scsi/qla2xxx/qla_def.h:4633:0,
                 from drivers/scsi/qla2xxx/qla_gs.c:7:
drivers/scsi/qla2xxx/qla_gbl.h:661:5: note: declared here
 int qla24xx_async_gpnft(scsi_qla_host_t *, u8, srb_t *);
     ^~~~~~~~~~~~~~~~~~~

Caused by commit

  33b28357dd00 ("scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan")

interacting with commit

  2b5b96473efc ("scsi: qla2xxx: Fix FC-NVMe LUN discovery")

from Linus' tree.

I have added the following merge fix patch for today. Unfortunately it
produces this warning, so a better merge resolution is needed ...

drivers/scsi/qla2xxx/qla_gs.c: In function 'qla24xx_async_gnnft_done':
drivers/scsi/qla2xxx/qla_gs.c:3974:9: warning: 'rp' may be used uninitialized in this function [-Wmaybe-uninitialized]
  if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
       ~~^~~~~~~~~


From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 22 Mar 2018 17:09:38 +1100
Subject: [PATCH] scsi: qla2xxx: merge fix in qla_gs.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/scsi/qla2xxx/qla_gs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index f84807e850c3..d33f4619332e 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3971,8 +3971,8 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
 	vha->scan.scan_flags &= ~SF_SCANNING;
 	spin_unlock_irqrestore(&vha->work_lock, flags);
 
-	if ((fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
-		qla24xx_async_gpnft(vha, FC4_TYPE_NVME);
+	if ((rp->fc4type == FC4_TYPE_FCP_SCSI) && vha->flags.nvme_enabled)
+		qla24xx_async_gpnft(vha, FC4_TYPE_NVME, NULL);
 }
 
 static void qla2x00_find_free_fcp_nvme_slot(struct scsi_qla_host *vha,
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-22  6:25 Stephen Rothwell [this message]
2018-03-22 16:33 ` Madhani, Himanshu
  -- strict thread matches above, loose matches on Subject: below --
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
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 publically 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=20180322172503.2d8e72ef@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=darren.trapp@cavium.com \
    --cc=himanshu.madhani@cavium.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=quinn.tran@cavium.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git