From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753278AbaIZIS3 (ORCPT ); Fri, 26 Sep 2014 04:18:29 -0400 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:43559 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752154AbaIZIS1 (ORCPT ); Fri, 26 Sep 2014 04:18:27 -0400 Date: Fri, 26 Sep 2014 09:18:04 +0100 From: Russell King - ARM Linux To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Thompson , Carlo Caione , Krzysztof =?utf-8?Q?Ha=C5=82asa?= , Florian Fainelli Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20140926081804.GH5182@n2100.arm.linux.org.uk> References: <20140926112344.3ee87d2f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140926112344.3ee87d2f@canb.auug.org.au> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1: > ks8695: Migrate debug_ll macros to shared directory"), e38c399ca584 > ("ARM: 8144/2: netx: Migrate DEBUG_LL macros to shared directory"), > 6741cacfa3f1 ("ARM: 8145/1: sa1100: Migrate DEBUG_LL macros to shared > directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS > from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303 > ("ARM: meson: debug: add debug UART for earlyprintk support"), > b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM: > BCM63XX: add low-level UART debug support") from the arm-soc tree. > > I fixed it up (hopefully - see below) and can carry the fix as > necessary (no action is required). > > You may be able to clean some of this up by using intermediate config > symbols that are selected by the low level symbols and depended upon by > the higher level config symbols. Actually, I'll drop the patch set I have. I didn't spot this earlier, but people seem to have a hard time sorting stuff numerically: default 0xffd82340 if ARCH_IOP13XX + default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 + default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 + default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 default 0xfff36000 if DEBUG_HIGHBANK_UART It also looks like the same is true for arm-soc: > @@@ -1174,9 -1133,7 +1213,10 @@@ > default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \ > DEBUG_S3C2410_UART2) > default 0x7c0003f8 if FOOTBRIDGE > + default 0x80010000 if DEBUG_SA1100_UART1 > + default 0x80030000 if DEBUG_SA1100_UART2 > + default 0x80050000 if DEBUG_SA1100_UART3 > + default 0x78000000 if DEBUG_CNS3XXX Last time I checked, 0x78000000 comes before 0x7c0003f8. -- FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net.