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

[Yoshihiro Shimoda]

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