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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: build failure after merge of the block tree
Date	2016-03-07 04:30 +0100
Message-ID	<r9U1Q-5KX-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Jens,

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

ERROR: "nvme_kill_queues" [drivers/nvme/host/nvme.ko] undefined!

Caused by commit

  576d55d62566 ("nvme: split pci module out of core module")

interacting with commit

  69d9a99c258e ("NVMe: Move error handling to failed reset handler")

from Linus' tree.

I applied the merge fix patch below.  Maybe you should do a back merge
of Linus' tree and fix this up as well as the conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Mar 2016 14:24:19 +1100
Subject: [PATCH] nvme: fix up for "split pci module out of core module"

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

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index db47bbda06b3..e2d11d623e33 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1508,6 +1508,7 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
 	}
 	mutex_unlock(&ctrl->namespaces_mutex);
 }
+EXPORT_SYMBOL_GPL(nvme_kill_queues);
 
 void nvme_stop_queues(struct nvme_ctrl *ctrl)
 {
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: build failure after merge of the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-07 04:30 +0100

csiph-web