On Tue, Feb 26, 2019 at 06:39:15PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> /home/sfr/next/next/arch/powerpc/kernel/setup_32.c:176:21: error: redefinition of 'alloc_stack'
> static void *__init alloc_stack(void)
> ^~~~~~~~~~~
> /home/sfr/next/next/arch/powerpc/kernel/setup_32.c:165:21: note: previous definition of 'alloc_stack' was here
> static void *__init alloc_stack(void)
> ^~~~~~~~~~~
>
> Caused by patch
>
> "powerpc: use memblock functions returning virtual address"
>
> from the akpm tree interacting with commit
>
> c8e409a33cf8 ("powerpc/irq: use memblock functions returning virtual address")
>
> from the powerpc tree.
>
> Both patches added the alloc_stack() function and git resolved it by
> adding both. :-( I have added a patch to remove one of them.
Yeah, me too :)
https://lore.kernel.org/linux-mm/20190226064032.GA5873@rapoport-lnx/
Stephen, sorry, should have cc'ed you
> --
> Cheers,
> Stephen Rothwell
--
Sincerely yours,
Mike.
