From: Mike Rapoport <rppt@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
Subject: Re: linux-next: build failure after merge of the akpm tree
Date: Tue, 26 Feb 2019 10:16:38 +0200 [thread overview]
Message-ID: <20190226081637.GB11981@rapoport-lnx> (raw)
In-Reply-To: <20190226183915.053f5993@canb.auug.org.au>
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.
next prev parent reply other threads:[~2019-02-26 8:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 7:39 linux-next: build failure after merge of the akpm tree Stephen Rothwell
2019-02-26 8:16 ` Mike Rapoport [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-22 6:39 Stephen Rothwell
2020-04-22 18:33 ` Haren Myneni
2018-10-05 6:14 Stephen Rothwell
2018-10-05 12:02 ` Michael Ellerman
2018-10-05 12:46 ` Stephen Rothwell
2018-10-06 12:10 ` Michael Ellerman
2013-09-25 1:06 Stephen Rothwell
2013-09-25 1:21 ` Timur Tabi
2013-09-25 20:26 ` Andrew Morton
2013-09-25 21:32 ` Hugh Dickins
2013-09-25 21:43 ` Andrew Morton
2013-10-02 8:53 ` Frederic Weisbecker
2011-09-28 9:22 Stephen Rothwell
2011-09-28 22:03 ` Andrew Morton
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=20190226081637.GB11981@rapoport-lnx \
--to=rppt@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).