From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Shawn Guo <shawnguo@kernel.org>,
Dan Carpenter <dan.carpenter@linaro.org>,
James Clark <james.clark@linaro.org>,
Larisa Grigore <Larisa.Grigore@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Radu Pirea (NXP OSS)" <radu-nicolae.pirea@oss.nxp.com>
Subject: Re: linux-next: manual merge of the usb tree with the imx-mxs tree
Date: Wed, 9 Jul 2025 10:18:11 +0200 [thread overview]
Message-ID: <2025070903-census-heavily-929a@gregkh> (raw)
In-Reply-To: <20250709172138.34ffb49f@canb.auug.org.au>
On Wed, Jul 09, 2025 at 05:21:38PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got conflicts in:
>
> arch/arm64/boot/dts/freescale/s32g2.dtsi
> arch/arm64/boot/dts/freescale/s32g3.dtsi
>
> between commit:
>
> 06ee2f0e2180 ("arm64: dts: Add DSPI entries for S32G platforms")
>
> from the imx-mxs tree and commit:
>
> d1b07cc0868f ("arm64: dts: s32g: Add USB device tree information for s32g2/s32g3")
>
> from the usb 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.
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2025-07-09 8:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-09 7:21 linux-next: manual merge of the usb tree with the imx-mxs tree Stephen Rothwell
2025-07-09 8:18 ` Greg KH [this message]
2025-07-29 9:07 ` Geert Uytterhoeven
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=2025070903-census-heavily-929a@gregkh \
--to=greg@kroah.com \
--cc=Larisa.Grigore@nxp.com \
--cc=dan.carpenter@linaro.org \
--cc=james.clark@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=radu-nicolae.pirea@oss.nxp.com \
--cc=sfr@canb.auug.org.au \
--cc=shawnguo@kernel.org \
/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