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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 16 Feb 2021 14:21:04 +0000
From:   <nobuhiro1.iwamatsu@...hiba.co.jp>
To:     <naresh.kamboju@...aro.org>, <yoshihiro.shimoda.uh@...esas.com>,
        <sfr@...b.auug.org.au>
CC:     <davem@...emloft.net>, <netdev@...r.kernel.org>, <olof@...om.net>,
        <arnd@...db.de>, <linux-arm-kernel@...ts.infradead.org>,
        <bgolaszewski@...libre.com>, <linux-next@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <lkft-triage@...ts.linaro.org>
Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc
 tree

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@...aro.org>; Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>; Stephen
> Rothwell <sfr@...b.auug.org.au>
> Cc: David Miller <davem@...emloft.net>; Networking <netdev@...r.kernel.org>; Olof Johansson <olof@...om.net>; Arnd
> Bergmann <arnd@...db.de>; ARM <linux-arm-kernel@...ts.infradead.org>; Bartosz Golaszewski
> <bgolaszewski@...libre.com>; Linux Next Mailing List <linux-next@...r.kernel.org>; Linux Kernel Mailing List
> <linux-kernel@...r.kernel.org>; lkft-triage@...ts.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

Download attachment "0001-arm64-dts-visconti-Fix-parse-error-for-TMPV7708-RM-m.patch" of type "application/octet-stream" (1151 bytes)