2017-08-28 02:19:09

by Stephen Rothwell

Subject: linux-next: build failure after merge of the l2-mtd tree

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 <[email protected]>
Date: Mon, 28 Aug 2017 12:13:42 +1000
Subject: [PATCH] fix merge of l2-mtd tree

Signed-off-by: Stephen Rothwell <[email protected]>
---
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

2017-08-28 22:06:59

by Brian Norris

Subject: Re: linux-next: build failure after merge of the l2-mtd tree

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 <[email protected]>
> Date: Mon, 28 Aug 2017 12:13:42 +1000
> Subject: [PATCH] fix merge of l2-mtd tree
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> 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