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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Mar 2022 14:10:29 +1100

Hi all,

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

  Documentation/devicetree/bindings/mfd/syscon.yaml

between commit:

  844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons")

from the mfd tree and commit:

  c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible")

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/mfd/syscon.yaml
index 29d4a97f7108,5aa0daa55533..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -44,10 -44,7 +44,11 @@@ properties
                - hisilicon,hi6220-sramctrl
                - hisilicon,pcie-sas-subctrl
                - hisilicon,peri-subctrl
 +              - intel,lgm-syscon
 +              - marvell,armada-3700-usb2-host-misc
 +              - mediatek,mt8135-pctl-a-syscfg
 +              - mediatek,mt8135-pctl-b-syscfg
+               - microchip,lan966x-cpu-syscon
                - microchip,sparx5-cpu-syscon
                - mstar,msc313-pmsleep
                - rockchip,px30-qos