From: <nobuhiro1.iwamatsu@toshiba.co.jp>
To: <sfr@canb.auug.org.au>, <davem@davemloft.net>,
<netdev@vger.kernel.org>, <olof@lixom.net>, <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: bgolaszewski@baylibre.com, linux-next@vger.kernel.org,
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 02:20:29 +0000 [thread overview]
Message-ID: <OSBPR01MB2983FDFEF1D1E24E7C2DF0F692879@OSBPR01MB2983.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <20210216130449.3d1f0338@canb.auug.org.au>
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(岩松 信洋 □SWC◯ACT)
> <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
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-16 2:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 2:04 linux-next: manual merge of the net-next tree with the arm-soc tree Stephen Rothwell
2021-02-16 2:20 ` nobuhiro1.iwamatsu [this message]
2021-02-16 10:11 ` Arnd Bergmann
2021-02-16 11:53 ` Yoshihiro Shimoda
2021-02-16 12:28 ` Naresh Kamboju
2021-02-16 13:47 ` nobuhiro1.iwamatsu
2021-02-16 14:21 ` nobuhiro1.iwamatsu
2021-02-16 21:17 ` Stephen Rothwell
2021-02-17 0:23 ` Yoshihiro Shimoda
-- strict thread matches above, loose matches on Subject: below --
2022-07-13 2:55 Stephen Rothwell
2019-09-05 3:42 Stephen Rothwell
2016-12-01 1:31 Stephen Rothwell
2016-07-27 2:53 Stephen Rothwell
2016-07-27 20:41 ` Duc Dang
2016-06-21 1:18 Stephen Rothwell
2016-06-21 8:56 ` Arnd Bergmann
2016-05-10 0:18 Stephen Rothwell
2015-01-27 2:04 Stephen Rothwell
2014-09-25 2:58 Stephen Rothwell
2014-09-10 4:48 Stephen Rothwell
2014-09-10 8:06 ` Arnd Bergmann
2014-03-31 2:24 Stephen Rothwell
2012-01-04 4:06 Stephen Rothwell
2012-01-04 4:46 ` Richard Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=OSBPR01MB2983FDFEF1D1E24E7C2DF0F692879@OSBPR01MB2983.jpnprd01.prod.outlook.com \
--to=nobuhiro1.iwamatsu@toshiba.co.jp \
--cc=arnd@arndb.de \
--cc=bgolaszewski@baylibre.com \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).