Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbdF1GHU (ORCPT ); Wed, 28 Jun 2017 02:07:20 -0400 Received: from ozlabs.org ([103.22.144.67]:51875 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934AbdF1GHN (ORCPT ); Wed, 28 Jun 2017 02:07:13 -0400 Date: Wed, 28 Jun 2017 16:07:11 +1000 From: Stephen Rothwell To: Yury Norov , Sumit Semwal , "David S. Miller" , Olof Johansson , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, LABBE Corentin , Maxime Ripard , Chen-Yu Tsai , Linux-Next Mailing List Subject: Re: arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver) Message-ID: <20170628160711.08763ee7@canb.auug.org.au> In-Reply-To: <20170610092944.4022d550@canb.auug.org.au> References: <20170609124325.p7b6fhdbwtki4w2z@yury-thinkpad> <20170610092944.4022d550@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 Content-Length: 3057 Lines: 80 Hi all, [Yes, top posted :-)] With the merge window approaching, this is just a reminder that this merge problem still exists. I assume that the sunxi tree will be merged into the arm-soc tree before going to Linus. On Sat, 10 Jun 2017 09:29:44 +1000 Stephen Rothwell wrote: > > On Fri, 9 Jun 2017 15:43:25 +0300 Yury Norov wrote: > > > > Today's linux-next breaks build with: > > DTC arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb > > arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb: ERROR (duplicate_node_names): Duplicate node name /soc/ethernet@1c30000 > > ERROR: Input tree has errors, aborting (use -f to force output) > > scripts/Makefile.lib:325: recipe for target 'arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb' failed > > make[2]: *** [arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb] Error 2 > > scripts/Makefile.build:561: recipe for target 'arch/arm64/boot/dts/allwinner' failed > > make[1]: *** [arch/arm64/boot/dts/allwinner] Error 2 arch/arm64/Makefile:130: recipe for target 'dtbs' failed > > make: *** [dtbs] Error 2 > > > > It seems, it's due to duplication error in merge-commit 9afca2c4e379. > > Removing it fixes the build. > > Thanks for the reports Yury and Sumit. I will apply the following > merge fixup patch when I next build linux-next (unless one of the > patches is removed in the mean time). > > From: Stephen Rothwell > Date: Sat, 10 Jun 2017 09:18:14 +1000 > Subject: [PATCH] remove duplicate ethernet noce intruduced by merge > > caused by patch "arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet > driver" being merged into the sunxi and net-next trees as different > commits (e53f67e981bc and 103aefa01c1b respectively). Presumably the > former will turn up in the arm-soc tree before being sent to Linus. > > Signed-off-by: Stephen Rothwell > --- > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > index 1b36aab5afb6..9d00622ce845 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > @@ -469,26 +469,6 @@ > }; > }; > > - emac: ethernet@1c30000 { > - compatible = "allwinner,sun50i-a64-emac"; > - syscon = <&syscon>; > - reg = <0x01c30000 0x100>; > - interrupts = ; > - interrupt-names = "macirq"; > - resets = <&ccu RST_BUS_EMAC>; > - reset-names = "stmmaceth"; > - clocks = <&ccu CLK_BUS_EMAC>; > - clock-names = "stmmaceth"; > - status = "disabled"; > - #address-cells = <1>; > - #size-cells = <0>; > - > - mdio: mdio { > - #address-cells = <1>; > - #size-cells = <0>; > - }; > - }; > - > gic: interrupt-controller@1c81000 { > compatible = "arm,gic-400"; > reg = <0x01c81000 0x1000>, > -- > 2.11.0 -- Cheers, Stephen Rothwell