Re: linux-next: manual merge of the tip tree with the arm64 tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the tip tree with the arm64 tree
Date	2017-03-31 13:30 +0200
Message-ID	<tr2UG-3Xe-45@gated-at.bofh.it> (permalink)
References	<tqV6N-7m5-13@gated-at.bofh.it> <tr1ce-2Nd-37@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Arnd,

On Fri, 31 Mar 2017 11:32:54 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> Mark Brown's build bot now reports this build failure:
> 
>         arm64-defconfig
> ../arch/arm64/include/asm/bug.h:62:29: error: implicit declaration of
> function '_BUG_FLAGS' [-Werror=implicit-function-declaration]
> 
> I think the last line needs s/_BUG_FLAGS/__BUG_FLAGS/
> aside from that, the merge looks right to me, but I wonder if
> there is a way to prevent the conflict from showing up later
> for Linus.

Yeah, I have fixed that for Monday.  I just presume that Linus will not
be half blind when he fixes it up. :-)

Or someone could remember to mention it to him. ;-)
-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-31 05:10 +0200
  Re: linux-next: manual merge of the tip tree with the arm64 tree Arnd Bergmann <arnd@arndb.de> - 2017-03-31 11:40 +0200
    Re: linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-31 13:30 +0200

csiph-web