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

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

[Brian Norris]

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 <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)

I think this is right, and it matches what Boris is pushing.

Regards,
Brian

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

[Brian Norris]

Hi,

On Thu, Feb 09, 2017 at 12:08:39PM +1100, Stephen Rothwell wrote:
> Hi Brian,
> 
> After merging the l2-mtd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!
> ERROR: "of_flash_probe_gemini" [drivers/mtd/maps/physmap_of.ko] undefined!
> 
> Probably caused by commit
> 
>   56ff337ea433 ("mtd: physmap_of: add a hook for Gemini flash probing")
> 
> The config has:
> 
> CONFIG_MTD_PHYSMAP=m
> CONFIG_MTD_PHYSMAP_COMPAT=y
> CONFIG_MTD_PHYSMAP_OF=m
> CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
> CONFIG_MTD_PHYSMAP_OF_GEMINI=y
> 
> I am not sure why this is a problem, but previously physmap_of_versatile.o
> would have been in obj-m and it is now in obj-y.

I think this part of that change does it:

--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -18,9 +18,8 @@ obj-$(CONFIG_MTD_TSUNAMI)     += tsunami_flash.o
 obj-$(CONFIG_MTD_PXA2XX)       += pxa2xx-flash.o
 obj-$(CONFIG_MTD_PHYSMAP)      += physmap.o
 obj-$(CONFIG_MTD_PHYSMAP_OF)   += physmap_of.o
-ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE
-obj-$(CONFIG_MTD_PHYSMAP_OF)   += physmap_of_versatile.o
-endif
+obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
+obj-$(CONFIG_MTD_PHYSMAP_OF_GEMINI)    += physmap_of_gemini.o
 obj-$(CONFIG_MTD_PISMO)                += pismo.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
 obj-$(CONFIG_MTD_PCMCIA)       += pcmciamtd.o

We were previously just keeping physmap_of_versatile in sync with physmap_of.
So it could be a module, even though CONFIG_MTD_PHYSMAP_OF_VERSATILE was
'bool'.

This is kind of a weird scenario, since physmap_of actually depends on
*_versatile or *_gemini (when enabled). Maybe we should revert to something
like the original logic. We can even actually merge the 3 modules (and then
drop the EXPORT_*s too):

diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 2fec1e0c2371..aef1846b4de2 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -17,9 +17,13 @@ obj-$(CONFIG_MTD_CK804XROM)	+= ck804xrom.o
 obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o
 obj-$(CONFIG_MTD_PXA2XX)	+= pxa2xx-flash.o
 obj-$(CONFIG_MTD_PHYSMAP)	+= physmap.o
+ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE
+physmap_of-objs += physmap_of_versatile.o
+endif
+ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI
+physmap_of-objs += physmap_of_gemini.o
+endif
 obj-$(CONFIG_MTD_PHYSMAP_OF)	+= physmap_of.o
-obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE)	+= physmap_of_versatile.o
-obj-$(CONFIG_MTD_PHYSMAP_OF_GEMINI)	+= physmap_of_gemini.o
 obj-$(CONFIG_MTD_PISMO)		+= pismo.o
 obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o
 obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o

I'll cook that into a proper patch if it seems good.

> I have used the version fo the l2-mtd tree from next-20170208 for today.

Sounds good.

Brian

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 808 bytes --]

Hi Artem,

After merging the l2-mtd tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/devices/pmc551.c:191:12: error: conflicting types for 'pmc551_unpoint'
include/linux/mtd/pmc551.h:37:13: note: previous declaration of 'pmc551_unpoint' was here
drivers/mtd/devices/pmc551.c: In function 'pmc551_unpoint':
drivers/mtd/devices/pmc551.c:196:1: warning: no return statement in function returning non-void [-Wreturn-type]

Caused by commit 753c57f84b57 ("mtd: return error code from
mtd_unpoint").  [Mind you, I don't understand why those static functions
would be declared in a header file ...]

I have used the l2-mtd tree from next-20120203 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Artem Bityutskiy]

[-- Attachment #1: Type: text/plain, Size: 999 bytes --]

On Mon, 2012-02-06 at 12:07 +1100, Stephen Rothwell wrote:
> Hi Artem,
> 
> After merging the l2-mtd tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/mtd/devices/pmc551.c:191:12: error: conflicting types for 'pmc551_unpoint'
> include/linux/mtd/pmc551.h:37:13: note: previous declaration of 'pmc551_unpoint' was here
> drivers/mtd/devices/pmc551.c: In function 'pmc551_unpoint':
> drivers/mtd/devices/pmc551.c:196:1: warning: no return statement in function returning non-void [-Wreturn-type]
> 
> Caused by commit 753c57f84b57 ("mtd: return error code from
> mtd_unpoint").  [Mind you, I don't understand why those static functions
> would be declared in a header file ...]

Thanks, fixed. I am doing rather massive MTD API cleaning, so new small
issues are possible.

WRT the header file - I think it should not be in 'inlude/linux' at all
- I'll try to cook a patch to kick it out of there, thanks!

-- 
Best Regards,
Artem Bityutskiy

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 858 bytes --]

Hi Artem,

On Mon, 06 Feb 2012 11:14:14 +0200 Artem Bityutskiy <dedekind1@gmail.com> wrote:
>
> On Mon, 2012-02-06 at 12:07 +1100, Stephen Rothwell wrote:
> > 
> > drivers/mtd/devices/pmc551.c:191:12: error: conflicting types for 'pmc551_unpoint'
> > include/linux/mtd/pmc551.h:37:13: note: previous declaration of 'pmc551_unpoint' was here
> > drivers/mtd/devices/pmc551.c: In function 'pmc551_unpoint':
> > drivers/mtd/devices/pmc551.c:196:1: warning: no return statement in function returning non-void [-Wreturn-type]
> 
> Thanks, fixed. I am doing rather massive MTD API cleaning, so new small
> issues are possible.

You fixed the header file, but not the fact that pmc551_unpoint() still
doesn't return anything ... Warnings are there for a reason sometimes :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]