From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Brian Norris <computersforpeace@gmail•com>
Cc: "Linux-Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Mario Rugiero" <mrugiero@gmail•com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>
Subject: linux-next: build failure after merge of the l2-mtd tree
Date: Mon, 28 Aug 2017 12:19:05 +1000 [thread overview]
Message-ID: <20170828121905.36ff8a63@canb.auug.org.au> (raw)
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 <sfr@canb•auug.org.au>
Date: Mon, 28 Aug 2017 12:13:42 +1000
Subject: [PATCH] fix merge of l2-mtd tree
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
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
next reply other threads:[~2017-08-28 2:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-28 2:19 Stephen Rothwell [this message]
2017-08-28 22:06 ` linux-next: build failure after merge of the l2-mtd tree Brian Norris
-- strict thread matches above, loose matches on Subject: below --
2017-02-09 1:08 Stephen Rothwell
2017-02-09 1:59 ` Brian Norris
2016-07-19 0:59 Stephen Rothwell
2016-07-19 1:20 ` Brian Norris
2016-07-19 1:46 ` Stephen Rothwell
2015-12-21 5:47 Stephen Rothwell
2015-09-30 5:16 Stephen Rothwell
2014-05-22 5:30 Stephen Rothwell
2014-05-26 17:42 ` Brian Norris
2014-05-26 23:59 ` Stephen Rothwell
2014-05-27 10:40 ` Artem Bityutskiy
2014-05-27 22:49 ` Stephen Rothwell
2012-10-12 0:14 Stephen Rothwell
2012-10-12 4:51 ` Dinh Nguyen
2012-10-18 0:28 ` Stephen Rothwell
2012-10-18 9:26 ` Artem Bityutskiy
2012-02-07 2:58 Stephen Rothwell
2012-02-07 8:02 ` Artem Bityutskiy
2012-02-06 1:07 Stephen Rothwell
2012-02-06 9:14 ` Artem Bityutskiy
2012-02-06 21:10 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170828121905.36ff8a63@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=computersforpeace@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mrugiero@gmail$(echo .)com \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox