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

From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	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>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>,
	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: RE: linux-next: manual merge of the net-next tree with the arm-soc tree
Date: Tue, 16 Feb 2021 11:53:56 +0000	[thread overview]
Message-ID: <TY2PR01MB3692F75AF6192AB0B082B493D8879@TY2PR01MB3692.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <20210216130449.3d1f0338@canb.auug.org.au>

Hi,

> From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
<snip>
> diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e,48fa8776e36f..000000000000
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> @@@ -42,11 -42,20 +42,29 @@@
>   	clock-names = "apb_pclk";
>   };
> 
>  +&wdt {
>  +	status = "okay";
>  +	clocks = <&wdt_clk>;
>  +};
>  +
>  +&gpio {
>  +	status = "okay";
> ++};`

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

Best regards,
Yoshihiro Shimoda