Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751334AbdH1WG7 (ORCPT ); Mon, 28 Aug 2017 18:06:59 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33835 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841AbdH1WG6 (ORCPT ); Mon, 28 Aug 2017 18:06:58 -0400 Date: Mon, 28 Aug 2017 15:06:54 -0700 From: Brian Norris To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mario Rugiero , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , linux-mtd@lists.infradead.org, Boris Brezillon Subject: Re: linux-next: build failure after merge of the l2-mtd tree Message-ID: <20170828220654.GA141992@google.com> References: <20170828121905.36ff8a63@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170828121905.36ff8a63@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1759 Lines: 58 On Mon, Aug 28, 2017 at 12:19:05PM +1000, Stephen Rothwell wrote: > Hi Brian, Hi Stephen, > 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. Yes, this was expected in the divergence between a bugfix merge for 4.13 vs. a feature change in 4.14. I think Boris has fixed the conflict in his merges and is uploading that to l2-mtd/master (he's handling MTD for 4.14). Good to know you catch this too :) > 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) I think this is right, and it matches what Boris is pushing. Regards, Brian