From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Vinod Koul <vkoul@kernel.org>,
Kishon Vijay Abraham I <kishon@ti.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sandeep Maheswaram <sanm@codeaurora.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the usb tree
Date: Fri, 27 Aug 2021 10:20:43 +0200 [thread overview]
Message-ID: <YSigW8OMf2PPeauR@kroah.com> (raw)
In-Reply-To: <20210827165822.7186411f@canb.auug.org.au>
On Fri, Aug 27, 2021 at 04:58:22PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 9 Aug 2021 17:10:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the phy-next tree got a conflict in:
> >
> > Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> >
> > between commit:
> >
> > e516ac5d48fe ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for SC7280")
> >
> > from the usb tree and commit:
> >
> > 1a00d130596f ("dt-bindings: phy: qcom,qmp-usb3-dp: Add support for sc8180x")
> >
> > from the phy-next tree.
> >
> >
> > diff --cc Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > index 20199833f144,1d49cc3d4eae..000000000000
> > --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
> > @@@ -14,7 -14,7 +14,8 @@@ properties
> > compatible:
> > enum:
> > - qcom,sc7180-qmp-usb3-dp-phy
> > + - qcom,sc7280-qmp-usb3-dp-phy
> > + - qcom,sc8180x-qmp-usb3-dp-phy
> > - qcom,sdm845-qmp-usb3-dp-phy
> > - qcom,sm8250-qmp-usb3-dp-phy
> > reg:
>
> This is now a conflict between the char-misc tree and the usb tree.
Resolution looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2021-08-27 8:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 7:10 linux-next: manual merge of the phy-next tree with the usb tree Stephen Rothwell
2021-08-09 7:39 ` Greg KH
2021-08-27 6:58 ` Stephen Rothwell
2021-08-27 8:20 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 2:00 Stephen Rothwell
2023-10-04 6:39 ` Greg KH
2020-01-07 3:24 Stephen Rothwell
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=YSigW8OMf2PPeauR@kroah.com \
--to=greg@kroah.com \
--cc=bjorn.andersson@linaro.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sanm@codeaurora.org \
--cc=sfr@canb.auug.org.au \
--cc=vkoul@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 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.