From: Shawn Guo <shawnguo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Marc Kleine-Budde <mkl@pengutronix.de>
Cc: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Networking <netdev@vger.kernel.org>, Frank Li <Frank.Li@nxp.com>,
Haibo Chen <haibo.chen@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the imx-mxs tree with the net tree
Date: Thu, 12 Oct 2023 08:43:56 +0800 [thread overview]
Message-ID: <20231012004356.GR819755@dragon> (raw)
In-Reply-To: <20231012101434.1e5e7340@canb.auug.org.au>
On Thu, Oct 12, 2023 at 10:14:34AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the imx-mxs tree got a conflict in:
>
> arch/arm64/boot/dts/freescale/imx93.dtsi
>
> between commit:
>
> 23ed2be5404d ("arm64: dts: imx93: add the Flex-CAN stop mode by GPR")
Marc,
Is there any particular reason why this dts change needs to go via net
tree? Otherwise, could you drop it from net and let it go via i.MX tree?
Shawn
>
> from the net tree and commit:
>
> d34d2aa594d0 ("arm64: dts: imx93: add edma1 and edma2")
>
> from the imx-mxs 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.
next prev parent reply other threads:[~2023-10-12 0:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 23:14 linux-next: manual merge of the imx-mxs tree with the net tree Stephen Rothwell
2023-10-12 0:43 ` Shawn Guo [this message]
2023-10-12 7:28 ` Marc Kleine-Budde
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=20231012004356.GR819755@dragon \
--to=shawnguo@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=davem@davemloft.net \
--cc=haibo.chen@nxp.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--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