From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933459AbdCaLZP (ORCPT ); Fri, 31 Mar 2017 07:25:15 -0400 Received: from ozlabs.org ([103.22.144.67]:57811 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933444AbdCaLZM (ORCPT ); Fri, 31 Mar 2017 07:25:12 -0400 Date: Fri, 31 Mar 2017 22:24:58 +1100 From: Stephen Rothwell To: Arnd Bergmann Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Catalin Marinas , Linux-Next Mailing List , Linux Kernel Mailing List , Mark Brown Subject: Re: linux-next: manual merge of the tip tree with the arm64 tree Message-ID: <20170331222458.45534c5c@canb.auug.org.au> In-Reply-To: References: <20170331140217.3c0fc28f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, On Fri, 31 Mar 2017 11:32:54 +0200 Arnd Bergmann 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