From: Rob Herring <robherring2@gmail.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sandeep Maheswaram <sanm@codeaurora.org>,
Felipe Balbi <balbi@kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the devicetree tree
Date: Thu, 28 May 2020 08:14:36 -0600 [thread overview]
Message-ID: <CAL_JsqKYUOPFS=0rWuUL2HLNz1DdKbYULckAWnCq-0v96-1S4g@mail.gmail.com> (raw)
In-Reply-To: <20200528104916.GD3115014@kroah.com>
On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
>
> On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the usb tree got a conflict in:
> >
> > Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> >
> > between commit:
> >
> > 3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >
> > from the devicetree tree and commits:
> >
> > cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >
> > from the usb tree.
> >
> > I fixed it up (I guessed, taking most changes from the former) 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.
Ugg, I fixed up a warning on my side...
>
> Sounds good,t hanks.
Greg, can you revert your copy and we can get rid of the conflict.
Rob
next prev parent reply other threads:[~2020-05-28 14:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 6:22 linux-next: manual merge of the usb tree with the devicetree tree Stephen Rothwell
2020-05-28 10:49 ` Greg KH
2020-05-28 14:14 ` Rob Herring [this message]
2020-05-29 8:26 ` Greg KH
2020-05-29 8:28 ` Greg KH
2020-05-29 8:44 ` Felipe Balbi
2020-05-29 14:04 ` Rob Herring
2020-05-29 14:24 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2023-10-18 2:13 Stephen Rothwell
2023-10-18 7:56 ` Greg KH
2013-06-25 6:53 Stephen Rothwell
2013-06-25 15:18 ` Greg KH
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='CAL_JsqKYUOPFS=0rWuUL2HLNz1DdKbYULckAWnCq-0v96-1S4g@mail.gmail.com' \
--to=robherring2@gmail.com \
--cc=balbi@kernel.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sanm@codeaurora.org \
--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.