Subject: linux-next: manual merge of the dt-krzk tree with the qcom tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 4 Jul 2022 12:11:33 +1000

Hi all,

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

  Documentation/devicetree/bindings/arm/qcom.yaml

between commit:

  bbd5a6891908 ("dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board")

from the qcom tree and commit:

  4fc3efba3205 ("dt-bindings: arm: qcom: add missing SDM630 board compatibles")

from the dt-krzk 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/arm/qcom.yaml
index 4dd18fbf20b6,02087bb1f698..000000000000
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@@ -44,9 -46,9 +46,10 @@@ description: 
          sc7280
          sc8180x
          sc8280xp
 +        sda660
          sdm630
          sdm632
+         sdm636
          sdm660
          sdm845
          sdx55
@@@ -548,11 -282,14 +589,19 @@@ properties
                - qcom,sc8280xp-qrd
            - const: qcom,sc8280xp
  
 +      - items:
 +          - enum:
 +              - inforce,ifc6560
 +          - const: qcom,sda660
 +
+       - items:
+           - enum:
+               - sony,discovery-row
+               - sony,kirin-row
+               - sony,pioneer-row
+               - sony,voyager-row
+           - const: qcom,sdm630
+ 
        - items:
            - enum:
                - fairphone,fp3