linux-next: build failure after merge of the block tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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

Attachment: pgpFMmouCbXY1.pgp
Description: OpenPGP digital signature