From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751816AbdH1CTJ (ORCPT ); Sun, 27 Aug 2017 22:19:09 -0400 Received: from ozlabs.org ([103.22.144.67]:51201 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbdH1CTI (ORCPT ); Sun, 27 Aug 2017 22:19:08 -0400 Date: Mon, 28 Aug 2017 12:19:05 +1000 From: Stephen Rothwell To: Brian Norris Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mario Rugiero , Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= Subject: linux-next: build failure after merge of the l2-mtd tree Message-ID: <20170828121905.36ff8a63@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Brian, After merging the l2-mtd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mtd/nand/nandsim.c: In function 'ns_init_module': drivers/mtd/nand/nandsim.c:2353:2: error: implicit declaration of function 'nandsim_debugfs_remove' [-Werror=implicit-function-declaration] nandsim_debugfs_remove(nand); ^ Caused by commit e8e3edb95ce6 ("mtd: create per-device and module-scope debugfs entries") interacting with commit b974696da1cf ("mtd: nandsim: remove debugfs entries in error path") from Linus' tree. I applied the following merge fix patch ... please check. From: Stephen Rothwell Date: Mon, 28 Aug 2017 12:13:42 +1000 Subject: [PATCH] fix merge of l2-mtd tree Signed-off-by: Stephen Rothwell --- drivers/mtd/nand/nandsim.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 00635fd738f6..1ddf0b73c246 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -2350,7 +2350,6 @@ static int __init ns_init_module(void) return 0; err_exit: - nandsim_debugfs_remove(nand); free_nandsim(nand); nand_release(nsmtd); for (i = 0;i < ARRAY_SIZE(nand->partitions); ++i) -- 2.13.2 -- Cheers, Stephen Rothwell