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

nobuhiro1.iwamatsu
2021-02-16T02:22:46Z

Hi,

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Tuesday, February 16, 2021 11:05 AM
> To: 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>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux
> Next Mailing List <linux-next@vger.kernel.org>; iwamatsu nobuhiro(岩松 信洋 □ＳＷＣ◯ＡＣＴ)
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
>
> between commits:
>
> 4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
> 0109a17564fc ("arm: dts: visconti: Add DT support for Toshiba Visconti5 GPIO driver")
>
> from the arm-soc tree and commit:
>
> ec8a42e73432 ("arm: dts: visconti: Add DT support for Toshiba Visconti5 ethernet controller")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>

This is because the DTS changes are included in net-next. This patch should be merged via the soc tree.
I had the same problem before. How is it correct to send a DTS patch?
Should I separate into different series?

Best regards,
Nobuhiro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org