Received-SPF: pass (google.com: domain of linux-kernel+bounces-55919-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Wed, 7 Feb 2024 15:09:47 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Guenter Roeck <linux@roeck-us.net>
Cc: Charles Hsu <ythsu0511@gmail.com>, Krzysztof Kozlowski
 <krzysztof.kozlowski@linaro.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 devicetree tree with the
 hwmon-staging tree
Message-ID: <20240207150947.1f2bb82c@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YfEiLhIy.6LEA4Cd5+Y6/vI";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/YfEiLhIy.6LEA4Cd5+Y6/vI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/devicetree/bindings/trivial-devices.yaml

between commit:

  fd67e0c7b60b ("dt-bindings: Add MPQ8785 voltage regulator device")

from the hwmon-staging tree and commit:

  6284d33d1749 ("dt-bindings: trivial-devices: sort entries alphanumericall=
y")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
index 842eb65e4c03,41982a41398a..000000000000
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -47,10 -48,10 +48,12 @@@ properties
            - adi,lt7182s
              # AMS iAQ-Core VOC Sensor
            - ams,iaq-core
 +            # Temperature monitoring of Astera Labs PT5161L PCIe retimer
 +          - asteralabs,pt5161l
              # i2c serial eeprom (24cxx)
            - at,24c08
+             # i2c h/w elliptic curve crypto module
+           - atmel,atecc508a
              # ATSHA204 - i2c h/w symmetric crypto module
            - atmel,atsha204
              # ATSHA204A - i2c h/w symmetric crypto module
@@@ -295,6 -280,20 +282,22 @@@
            - miramems,da280
              # MiraMEMS DA311 3-axis 12-bit digital accelerometer
            - miramems,da311
+             # Monolithic Power Systems Inc. multi-phase controller mp2856
+           - mps,mp2856
+             # Monolithic Power Systems Inc. multi-phase controller mp2857
+           - mps,mp2857
+             # Monolithic Power Systems Inc. multi-phase controller mp2888
+           - mps,mp2888
+             # Monolithic Power Systems Inc. multi-phase controller mp2971
+           - mps,mp2971
+             # Monolithic Power Systems Inc. multi-phase controller mp2973
+           - mps,mp2973
+             # Monolithic Power Systems Inc. multi-phase controller mp2975
+           - mps,mp2975
+             # Monolithic Power Systems Inc. multi-phase hot-swap controll=
er mp5990
+           - mps,mp5990
++            # Monolithic Power Systems Inc. synchronous step-down convert=
er mpq8785
++          - mps,mpq8785
              # Temperature sensor with integrated fan control
            - national,lm63
              # Serial Interface ACPI-Compatible Microprocessor System Hard=
ware Monitor

--Sig_/YfEiLhIy.6LEA4Cd5+Y6/vI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXDAosACgkQAVBC80lX
0Gx+Rgf7B3DC+yo3kNIKHgG9RKZi2hpn7LX4vb6U+QPb7YFK4Q3xOA4GMKxvkS3O
+tKn3bYnyK/zz+vE8fyUm/CODcEHu2/UOMUJvTjlaYa0Q1DPraWXyRlkMZPHp5kn
d0CY6Q5N7oY8jwrxDJVoN6tY6pLj53zsDjNfIuupnAhj9wGMgyWmKN6D4Q+hGj1p
G37BnCONvSeDk+qO2o3kWUnoU8YOMm0gN8zGWtQgabp7L8CrZaNu+wunF+i/eq0u
oL0XXDbJjrX/CX7tonvGMy0S9Z2IaMRJZiPNrQ5/tW61MWecEqSq7HxlHjjySfE7
iB3MO7RW0v1u+hRNreAG1iNXvl+ekQ==
=EMdf
-----END PGP SIGNATURE-----

--Sig_/YfEiLhIy.6LEA4Cd5+Y6/vI--