RE: linux-next: manual merge of the net-next tree with the arm-soc tree

[<nobuhiro1.iwamatsu@toshiba.co.jp>]

[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]

Hi,

I attached a patch which revise this issue.
If I need to send with git send-email, please let me know.

Best regards,
  Nobuhiro

> -----Original Message-----
> From: iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ)
> Sent: Tuesday, February 16, 2021 10:47 PM
> To: Naresh Kamboju <naresh.kamboju@linaro.org>; Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>; Stephen
> Rothwell <sfr@canb.auug.org.au>
> Cc: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>; Olof Johansson <olof@lixom.net>; Arnd
> Bergmann <arnd@arndb.de>; ARM <linux-arm-kernel@lists.infradead.org>; Bartosz Golaszewski
> <bgolaszewski@baylibre.com>; Linux Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Mailing List
> <linux-kernel@vger.kernel.org>; lkft-triage@lists.linaro.org
> Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc tree
> 
> Hi,
> 
> Thnaks for your report.
> 
> > LKFT builders also found this problem while building arm64 dtb.
> >
> > > This ` causes the following build error on the next-20210216.
> > >
> > >   DTC     arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> > > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4 syntax error
> > > FATAL ERROR: Unable to parse input tree
> > > scripts/Makefile.lib:336: recipe for target 'arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb' failed
> > > make[2]: *** [arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb] Error 1
> > > scripts/Makefile.build:530: recipe for target 'arch/arm64/boot/dts/toshiba' failed
> >
> > ref:
> > https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
> >
> 
> This seems to be a problem fixing the conflict.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=c5e188ea08290d9b6625b4bef322012c0b
> 1902d7
> 
> ```
> diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e9..3760df93a89b5 100644
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> @@ -49,4 +49,22 @@
> 
>  &gpio {
>  	status = "okay";
> +};`
> +
> +&piether {
> +	status = "okay";
> +	phy-handle = <&phy0>;
> +	phy-mode = "rgmii-id";
> +	clocks = <&clk300mhz>, <&clk125mhz>;
> +	clock-names = "stmmaceth", "phy_ref_clk";
> +
> +	mdio0 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		compatible = "snps,dwmac-mdio";
> +		phy0: ethernet-phy@1 {
> +			device_type = "ethernet-phy";
> +			reg = <0x1>;
> +		};
> +	};
>  };
> ```
> 
> Stephen, could you fix this?
> 
> Best regards,
>   Nobuhiro

[-- Attachment #2: 0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch --]
[-- Type: application/octet-stream, Size: 1151 bytes --]

From 7d852e61df20487efd2ae3627cce498b85d2e884 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Date: Tue, 16 Feb 2021 23:05:09 +0900
Subject: [PATCH] arm64: dts: visconti: Fix parse error for TMPV7708 RM main
 board

The patch fix commit: c5e188ea08290d9 ("Merge remote-tracking branch
'net-next/master'").
This merge commit fixes tmpv7708-rm-mbrc.dts's conflict, but the typo
causes a parse error. This removes this typo.

ref: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/1033072509#L382
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
index 3760df93a89b57..230f487dd6b2e3 100644
--- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
+++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
@@ -49,7 +49,7 @@ &wdt {
 
 &gpio {
 	status = "okay";
-};`
+};
 
 &piether {
 	status = "okay";
-- 
2.30.0