Subject: linux-next: manual merge of the devicetree tree with the hwmon-staging tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Feb 2024 15:09:47 +1100

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 alphanumerically")

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/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 controller mp5990
+           - mps,mp5990
++            # Monolithic Power Systems Inc. synchronous step-down converter mpq8785
++          - mps,mpq8785
              # Temperature sensor with integrated fan control
            - national,lm63
              # Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor