Re: linux-next: build failure after merge of the akpm-current tree

From: Catalin Marinas
Date: Fri Aug 16 2019 - 10:00:09 EST


On Fri, Aug 16, 2019 at 10:16:03PM +1000, Stephen Rothwell wrote:
> After merging the akpm-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> mm/kmemleak.c: In function 'kmemleak_disable':
> mm/kmemleak.c:1884:2: error: 'kmemleak_early_log' undeclared (first use in this function); did you mean 'kmemleak_alloc'?
> kmemleak_early_log = 0;
> ^~~~~~~~~~~~~~~~~~
> kmemleak_alloc
> mm/kmemleak.c:1884:2: note: each undeclared identifier is reported only once for each function it appears in
>
> Caused by commit
>
> fcf3a5b62f43 ("mm: kmemleak: disable early logging in case of error")
>
> from Linus' tree mismerging with commits
>
> bce40af67cba ("mm: kmemleak: disable early logging in case of error")
> c405460afc4a ("mm: kmemleak: use the memory pool for early allocations")
>
> from the akpm-current tree.
>
> I just removed the above line again (as was dome in the last commit
> above).

Thanks. Commit c405460 should remove all traces of kmemleak_early_log
from current Linus' tree but somehow during merging in -next the line
reappeared.

--
Catalin