From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Felipe Balbi <balbi@kernel.org>, Rob Herring <robherring2@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Prashant Malani <pmalani@chromium.org>,
John Stultz <john.stultz@linaro.org>
Subject: linux-next: manual merge of the usb-gadget tree with the devicetree tree
Date: Mon, 16 Mar 2020 14:14:36 +1100 [thread overview]
Message-ID: <20200316141436.2113f68c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1671 bytes --]
Hi all,
Today's linux-next merge of the usb-gadget tree got a conflict in:
Documentation/devicetree/bindings/usb/generic.txt
between commit:
431a30b7d495 ("dt-bindings: Convert usb-connector to YAML format.")
from the devicetree tree and commit:
dd2d0d1fac2b ("dt-bindings: usb: generic: Add role-switch-default-mode binding")
from the usb-gadget tree.
I fixed it up (see below) 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
diff --cc Documentation/devicetree/bindings/usb/generic.txt
index 474e74c06522,67c51759a642..000000000000
--- a/Documentation/devicetree/bindings/usb/generic.txt
+++ b/Documentation/devicetree/bindings/usb/generic.txt
@@@ -34,7 -34,13 +34,13 @@@ Optional properties
- usb-role-switch: boolean, indicates that the device is capable of assigning
the USB data role (USB host or USB device) for a given
USB connector, such as Type-C, Type-B(micro).
- see connector/usb-connector.txt.
+ see connector/usb-connector.yaml.
+ - role-switch-default-mode: indicating if usb-role-switch is enabled, the
+ device default operation mode of controller while usb
+ role is USB_ROLE_NONE. Valid arguments are "host" and
+ "peripheral". Defaults to "peripheral" if not
+ specified.
+
This is an attribute to a USB controller such as:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-16 3:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 3:14 Stephen Rothwell [this message]
2020-03-17 4:21 ` linux-next: manual merge of the usb-gadget tree with the devicetree tree 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=20200316141436.2113f68c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@kernel.org \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pmalani@chromium.org \
--cc=robherring2@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).