* arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
@ 2017-06-09 12:43 Yury Norov
2017-06-09 23:29 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Yury Norov @ 2017-06-09 12:43 UTC (permalink / raw)
To: linux-arm-kernel
Hi Stephen,
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 at 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.
Yury
^ permalink raw reply [flat|nested] 4+ messages in thread
* arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
2017-06-09 12:43 arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver) Yury Norov
@ 2017-06-09 23:29 ` Stephen Rothwell
2017-06-28 6:07 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-06-09 23:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Yury,
On Fri, 9 Jun 2017 15:43:25 +0300 Yury Norov <ynorov@caviumnetworks.com> 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 at 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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
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 at 1c30000 {
- compatible = "allwinner,sun50i-a64-emac";
- syscon = <&syscon>;
- reg = <0x01c30000 0x100>;
- interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
- 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 at 1c81000 {
compatible = "arm,gic-400";
reg = <0x01c81000 0x1000>,
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 4+ messages in thread* arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
2017-06-09 23:29 ` Stephen Rothwell
@ 2017-06-28 6:07 ` Stephen Rothwell
2017-06-29 7:48 ` Maxime Ripard
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-06-28 6:07 UTC (permalink / raw)
To: linux-arm-kernel
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 <sfr@canb.auug.org.au> wrote:
>
> On Fri, 9 Jun 2017 15:43:25 +0300 Yury Norov <ynorov@caviumnetworks.com> 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 at 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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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 at 1c30000 {
> - compatible = "allwinner,sun50i-a64-emac";
> - syscon = <&syscon>;
> - reg = <0x01c30000 0x100>;
> - interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
> - 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 at 1c81000 {
> compatible = "arm,gic-400";
> reg = <0x01c81000 0x1000>,
> --
> 2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread* arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver)
2017-06-28 6:07 ` Stephen Rothwell
@ 2017-06-29 7:48 ` Maxime Ripard
0 siblings, 0 replies; 4+ messages in thread
From: Maxime Ripard @ 2017-06-29 7:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Jun 28, 2017 at 04:07:11PM +1000, Stephen Rothwell wrote:
> 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.
It's already been merged in arm-soc. I haven't had any news from Dave
on this despite my mails, so I don't really know how to solve this.
Those patches really should never have been in net-next in the first
place.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170629/bba04f9e/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-29 7:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-09 12:43 arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver) Yury Norov
2017-06-09 23:29 ` Stephen Rothwell
2017-06-28 6:07 ` Stephen Rothwell
2017-06-29 7:48 ` Maxime Ripard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox