[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20170502131722.77a4c2b5@canb.auug.org.au>
Date: Tue, 2 May 2017 13:17:22 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>,
Peter Zijlstra <peterz@...radead.org>
Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Dan Williams <dan.j.williams@...el.com>,
Ming Lei <tom.leiming@...il.com>, Jens Axboe <axboe@...com>
Subject: linux-next: build failure after merge of the tip tree
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/nvdimm/pmem.c: In function 'pmem_freeze_queue':
drivers/nvdimm/pmem.c:237:2: error: implicit declaration of function 'blk_mq_freeze_queue_start' [-Werror=implicit-function-declaration]
blk_mq_freeze_queue_start(q);
^
Caused by commit
71389703839e ("mm, zone_device: Replace {get, put}_zone_device_page() with a single reference to fix pmem crash")
interacting with commit
1671d522cdd9 ("block: rename blk_mq_freeze_queue_start()")
from Linus' tree.
I have applied the merge fix patch below.
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 2 May 2017 13:09:41 +1000
Subject: [PATCH] mm, zone_device: merge fix up for blk_mq_freeze_queue_start()
rename
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/nvdimm/pmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index fb7bbc79ac26..fbc640bf06b0 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -234,7 +234,7 @@ static void pmem_release_queue(void *q)
static void pmem_freeze_queue(void *q)
{
- blk_mq_freeze_queue_start(q);
+ blk_freeze_queue_start(q);
}
static void pmem_release_disk(void *disk)
--
2.11.0
--
Cheers,
Stephen Rothwell
Powered by blists - more mailing lists