linux-kernel - linux-next: build failure after merge of the block 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Tue, 2 Jun 2020 13:25:36 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jens Axboe <axboe@...nel.dk>, Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yamin Friedman <yaminf@...lanox.com>,
        Max Gurtovoy <maxg@...lanox.com>,
        Christoph Hellwig <hch@....de>
Subject: linux-next: build failure after merge of the block tree

Hi all,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/device.h:15,
                 from include/rdma/ib_verbs.h:43,
                 from include/rdma/mr_pool.h:8,
                 from drivers/nvme/host/rdma.c:10:
drivers/nvme/host/rdma.c: In function 'nvme_rdma_create_queue_ib':
drivers/nvme/host/rdma.c:550:24: error: 'idx' undeclared (first use in this function); did you mean 'ida'?
  550 |     queue->queue_size, idx);
      |                        ^~~
include/linux/dev_printk.h:104:32: note: in definition of macro 'dev_err'
  104 |  _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
      |                                ^~~~~~~~~~~

Caused by commit

  583f69304b91 ("nvme-rdma: use new shared CQ mechanism")

from the rdma tree interacting with commit

  5ec5d3bddc6b ("nvme-rdma: add metadata/T10-PI support")

from the block tree.

I applied the following merge fix patch.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 2 Jun 2020 13:16:30 +1000
Subject: [PATCH] fix up for merge conflict with rdma tree

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/nvme/host/rdma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 6507b06d672d..4f0216e9f43d 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -547,7 +547,7 @@ static int nvme_rdma_create_queue_ib(struct nvme_rdma_queue *queue)
 		if (ret) {
 			dev_err(queue->ctrl->ctrl.device,
 				"failed to initialize PI MR pool sized %d for QID %d\n",
-				queue->queue_size, idx);
+				queue->queue_size, nvme_rdma_queue_idx(queue));
 			goto out_destroy_mr_pool;
 		}
 	}
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped