From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>
Cc: Andy Gross <agross@kernel•org>, Baruch Siach <baruch@tkos•co.il>,
Bjorn Andersson <bjorn.andersson@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Sean Anderson <sean.anderson@seco•com>,
ARM <linux-arm-kernel@lists•infradead.org>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree
Date: Fri, 18 Mar 2022 18:37:17 +1100 [thread overview]
Message-ID: <20220318183717.7acac615@canb.auug.org.au> (raw)
In-Reply-To: <YgTGihSrtlRR3DPC@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]
Hi all,
On Thu, 10 Feb 2022 09:02:18 +0100 Greg KH <greg@kroah•com> wrote:
>
> On Thu, Feb 10, 2022 at 02:11:00PM +1100, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the usb tree got a conflict in:
> >
> > arch/arm64/boot/dts/qcom/ipq6018.dtsi
> >
> > between commit:
> >
> > d1c10ab1494f ("arm64: dts: qcom: ipq6018: fix usb reference period")
> >
> > from the qcom tree and commit:
> >
> > 5726079cd486 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> >
> > from the usb tree.
> >
> > I fixed it up (I just use the latter) 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.
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
>
> That is fine, thanks.
This is now a conflict between the usb tree and the arm-soc tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-03-18 7:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 3:11 linux-next: manual merge of the usb tree with the qcom tree Stephen Rothwell
2022-02-10 8:02 ` Greg KH
2022-03-18 7:37 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 4:17 Stephen Rothwell
2025-01-08 12:13 ` Greg KH
2023-02-14 1:40 Stephen Rothwell
2023-02-14 6:46 ` Greg KH
2023-02-21 9:43 ` Geert Uytterhoeven
2022-02-21 19:16 broonie
2022-02-22 7:44 ` Greg KH
2021-09-21 2:30 Stephen Rothwell
2021-09-21 13:12 ` Bjorn Andersson
2021-09-21 13:16 ` Greg KH
2021-09-21 13:28 ` Bjorn Andersson
2021-08-06 14:13 Mark Brown
2021-08-06 14:09 Mark Brown
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=20220318183717.7acac615@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agross@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=baruch@tkos$(echo .)co.il \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sean.anderson@seco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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