From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: Felipe Balbi <balbi@kernel•org>,
Rob Herring <robherring2@gmail•com>,
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: Re: linux-next: manual merge of the usb-gadget tree with the devicetree tree
Date: Tue, 17 Mar 2020 15:21:49 +1100 [thread overview]
Message-ID: <20200317152149.3fd4db28@canb.auug.org.au> (raw)
In-Reply-To: <20200316141436.2113f68c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]
Hi all,
On Mon, 16 Mar 2020 14:14:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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:
>
This is now a conflict between the usb tree and the devicetree tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-03-17 4:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 3:14 linux-next: manual merge of the usb-gadget tree with the devicetree tree Stephen Rothwell
2020-03-17 4:21 ` Stephen Rothwell [this message]
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=20200317152149.3fd4db28@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=john.stultz@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pmalani@chromium$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/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