From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Rob Herring <robherring2@gmail•com>
Cc: 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: linux-next: manual merge of the usb tree with the devicetree tree
Date: Thu, 28 May 2020 16:22:15 +1000 [thread overview]
Message-ID: <20200528162215.3a9aa663@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-05-28 6:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 6:22 Stephen Rothwell [this message]
2020-05-28 10:49 ` linux-next: manual merge of the usb tree with the devicetree tree Greg KH
2020-05-28 14:14 ` Rob Herring
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=20200528162215.3a9aa663@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robherring2@gmail$(echo .)com \
--cc=sanm@codeaurora$(echo .)org \
/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