linux-next: manual merge of the devicetree tree with Linus' tree

Stephen Rothwell
2019-10-16T01:25:46Z

[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

Documentation/devicetree/bindings/usb/generic-ehci.yaml

between commit:

3aa3c66aedef ("dt-bindings: usb: Bring back phy-names")

from Linus' tree and commit:

02ceb12c20f5 ("dt-bindings: usb: generic-ehci: Add "companion" entry")

from the devicetree 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-ehci.yaml
index 1ca64c85191a,ce8854bc8c84..000000000000
--- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml
+++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml
@@@ -63,11 -63,12 +63,16 @@@ properties
description:
Set this flag to force EHCI reset after resume.

+ companion:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle of a companion.
+
- phys: true
+ phys:
+ description: PHY specifier for the USB PHY
+
+ phy-names:
+ const: usb

required:
- compatible