Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Date:   Wed, 18 Oct 2023 13:13:34 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Rob Herring <robh@kernel.org>
Cc:     Abdel Alkuor <abdelalkuor@geotab.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the usb tree with the devicetree tree
Message-ID: <20231018131334.5fb47992@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_Btt2PWcY33XfiDzmI/Qaaf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/_Btt2PWcY33XfiDzmI/Qaaf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/usb/ti,tps6598x.yaml

between commit:

  47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properti=
es")

from the devicetree tree and commit:

  6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")

from the usb 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.

--=20
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
index 6ab674dea4c6,72ac534e6ed2..000000000000
--- a/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
+++ b/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
@@@ -32,14 -47,43 +47,46 @@@ properties
      items:
        - const: irq
 =20
 +  connector:
 +    $ref: /schemas/connector/usb-connector.yaml#
 +
+   firmware-name:
+     description: |
+       Should contain the name of the default patch binary
+       file located on the firmware search path which is
+       used to switch the controller into APP mode.
+       This is used when tps25750 doesn't have an EEPROM
+       connected to it.
+     maxItems: 1
+=20
  required:
    - compatible
    - reg
 =20
+ allOf:
+   - if:
+       properties:
+         compatible:
+           contains:
+             const: ti,tps25750
+     then:
+       properties:
+         reg:
+           maxItems: 2
+=20
+         connector:
+           required:
+             - data-role
+=20
+       required:
+         - connector
+         - reg-names
+     else:
+       properties:
+         reg:
+           maxItems: 1
+=20
 -additionalProperties: true
 +additionalProperties: false
 =20
  examples:
    - |

--Sig_/_Btt2PWcY33XfiDzmI/Qaaf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUvP04ACgkQAVBC80lX
0Gy/uwf/Ssb8Fy+79wjy9/RCB8k+WGDHUeQ5He+RnU1r1PkpL1QlgL5nZxh1aQyD
MykkRmBn+ZgFZTacvrc1lNh7GzTJ8jBWtTt6NJW1jD8UQVEQojx0LYRc4xGobYwt
rO3rJF0Mcdp00PiTWxV1C72K62QRLN8IfqpM+7ebNvBvRFCLaqqdoy5+EF/knenh
xZEY5TMABbLm37FewRMNd7tchQGFaK6VoO5nVYFRtEXBc1HJ1lXM8ehypX9LOfd8
40ycf5JoZg+EAOEpBe1zKhFKTFckp6VgQRRP6RuWZkKe5nackeqlFrcA9riEe1yR
Ft+FuD/V1ZT2TAdVDdkt6iq9u9VJTQ==
=EAfY
-----END PGP SIGNATURE-----

--Sig_/_Btt2PWcY33XfiDzmI/Qaaf--