From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
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>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree
Date: Thu, 10 Feb 2022 09:02:18 +0100 [thread overview]
Message-ID: <YgTGihSrtlRR3DPC@kroah.com> (raw)
In-Reply-To: <20220210141100.715b13e9@canb.auug.org.au>
On Thu, Feb 10, 2022 at 02:11:00PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> 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.
greg k-h
next prev parent reply other threads:[~2022-02-10 8:11 UTC|newest]
Thread overview: 17+ 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 [this message]
2022-03-18 7:37 ` Stephen Rothwell
2022-03-18 7:37 ` Stephen Rothwell
-- 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=YgTGihSrtlRR3DPC@kroah.com \
--to=greg@kroah.com \
--cc=agross@kernel.org \
--cc=baruch@tkos.co.il \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean.anderson@seco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.