From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F9AEC433DB for ; Sun, 21 Feb 2021 22:05:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77DDF64F00 for ; Sun, 21 Feb 2021 22:05:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231312AbhBUWFg (ORCPT ); Sun, 21 Feb 2021 17:05:36 -0500 Received: from ozlabs.org ([203.11.71.1]:48883 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231270AbhBUWEL (ORCPT ); Sun, 21 Feb 2021 17:04:11 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DkK7w5Kjqz9sBy; Mon, 22 Feb 2021 09:03:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613945007; bh=wfkWd8AMlPzskJ8w4WDEByUSETn+/5uf6bjsNlJW15I=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BwXqG+Gw9ec5lIgBuJY1KkM9LFEHmEQ9QIBeDA8V+YhU7KKnYxlZL6yy9bQLqYr4s pOzov5wg51GCg8ZKiOZsW2HHh397OAq09knQtnZ15+0rJ3MIACCitXI61z41kNAHNI doAMon74ichXlvkWrKvQTvhCwvdqbYoQPjyy1Jqi//bCEooAWjwy7pnSFiVH5ECZuE qSgFffa4PkUgi5CFT/OLTWJxpLRY4SluSAJokZcQcWtfucYFQuy0oYXjx5f5+0xvQj IjzQppl6iB8i4lGeffdWgYSQVC4Ih0KoJZZJmYWCqPEMc7U+stUp+IxZ2atONL5biR used/Bww/WrHw== Date: Mon, 22 Feb 2021 09:03:23 +1100 From: Stephen Rothwell To: ARM , Russell King Cc: Olof Johansson , Arnd Bergmann , Alain VOLMAT , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20210222090323.6b3bdde6@canb.auug.org.au> In-Reply-To: <20210215091444.3300fb43@canb.auug.org.au> References: <20210202090135.04b9890e@canb.auug.org.au> <20210215091444.3300fb43@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/68lOm.Dosbhsek/_Ns.EnqX"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/68lOm.Dosbhsek/_Ns.EnqX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 15 Feb 2021 09:14:44 +1100 Stephen Rothwell = wrote: > > On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell = wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in: > >=20 > > arch/arm/Kconfig.debug > >=20 > > between commits: > >=20 > > 9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT f= or sti LL_UART") > > 6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 suppor= t") > >=20 > > from the arm tree and commits: > >=20 > > f3a732843acc ("ARM: remove sirf prima2/atlas platforms") > > 89d4f98ae90d ("ARM: remove zte zx platform") > >=20 > > from the arm-soc tree. > >=20 > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > >=20 > > diff --cc arch/arm/Kconfig.debug > > index 7a8697a97c98,c36c5d4c6e9c..000000000000 > > --- a/arch/arm/Kconfig.debug > > +++ b/arch/arm/Kconfig.debug > > @@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD > > default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4 > > default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART > > default "debug/s5pv210.S" if DEBUG_S5PV210_UART > > - default "debug/sirf.S" if DEBUG_SIRFSOC_UART > > - default "debug/sti.S" if DEBUG_STI_UART > > + default "debug/sti.S" if DEBUG_STIH41X_ASC2 > > + default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1 > > + default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0 > > default "debug/stm32.S" if DEBUG_STM32_UART > > default "debug/tegra.S" if DEBUG_TEGRA_UART > > default "debug/ux500.S" if DEBUG_UX500_UART > > @@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY > > default 0x02531000 if DEBUG_KEYSTONE_UART1 > > default 0x03010fe0 if ARCH_RPC > > default 0x07000000 if DEBUG_SUN9I_UART0 > > - default 0x09405000 if DEBUG_ZTE_ZX > > + default 0x09530000 if DEBUG_STIH418_SBC_ASC0 > > default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \ > > DEBUG_VEXPRESS_UART0_CA9 > > default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT > > @@@ -1789,10 -1698,8 +1707,10 @@@ > > DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \ > > DEBUG_S3C64XX_UART || \ > > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ > > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ > > + DEBUG_DIGICOLOR_UA0 || \ > > - DEBUG_AT91_UART || DEBUG_STM32_UART > > + DEBUG_AT91_UART || DEBUG_STM32_UART || \ > > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \ > > + DEBUG_STIH418_SBC_ASC0 > > =20 > > config DEBUG_UART_VIRT > > hex "Virtual base address of debug UART" > > @@@ -1854,12 -1760,9 +1772,11 @@@ > > default 0xfb020000 if DEBUG_OMAP3UART3 > > default 0xfb042000 if DEBUG_OMAP3UART4 > > default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT > > - default 0xfc705000 if DEBUG_ZTE_ZX > > default 0xfcfe8600 if DEBUG_BCM63XX_UART > > default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX > > + default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1 > > default 0xfd883000 if DEBUG_ALPINE_UART0 > > + default 0xfdd32000 if DEBUG_STIH41X_ASC2 > > default 0xfe010000 if STM32MP1_DEBUG_UART > > default 0xfe017000 if DEBUG_MMP_UART2 > > default 0xfe018000 if DEBUG_MMP_UART3 > > @@@ -1904,10 -1802,8 +1816,10 @@@ > > DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \ > > DEBUG_S3C64XX_UART || \ > > DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ > > - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ > > + DEBUG_DIGICOLOR_UA0 || \ > > - DEBUG_AT91_UART || DEBUG_STM32_UART > > + DEBUG_AT91_UART || DEBUG_STM32_UART || \ > > + DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \ > > + DEBUG_STIH418_SBC_ASC0 > > =20 > > config DEBUG_UART_8250_SHIFT > > int "Register offset shift for the 8250 debug UART" =20 >=20 > With the merge window about to open, this is a reminder that this > conflict still exists. This is now a conflict between the arm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/68lOm.Dosbhsek/_Ns.EnqX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAy2KsACgkQAVBC80lX 0Gytwgf/elTH9lP/N1H8ABhPZYz6eeS9JgNa4qSGGoQ0uuuFu2ZQnUVIC9h60tMl rfOlJxQ1yQP9b6EXagzK3nsuYoWifXxf00b4iWSThi8ygf/urpyjYKndkEwoIlFT A2lkrR390iQP4YBgpN+w58qd2w4sxA7qwrMSYr8mk8d4nunTBVo9aX+l8OQmWb68 eFYs6XZ6X8r1pTYqW55UKL86kI1nSsD6mRkUJX91xzwxIWJvOwdWxiolTTG+7Btd zSR0CQv1qL8D/YBDHi4KxaVwVaWMVoEM9hlJlMHspaCRQv+4y4k+vp0YFFKJWQ5P g8khOsKig7w3LRoruGNXMV07zcHEbQ== =VtH5 -----END PGP SIGNATURE----- --Sig_/68lOm.Dosbhsek/_Ns.EnqX--