linux-next: manual merge of the mfd tree with the qcom tree

[broonie]

Hi all,

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

  Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml

between commit:

  4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")

from the qcom tree and commits:

  f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
  a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")

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

diff --cc Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
index d3c25daa995e4,b12809b5cc22e..0000000000000
--- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
@@@ -15,31 -15,27 +15,27 @@@ description
  
  properties:
    compatible:
 -    items:
 -      - enum:
 -          - qcom,msm8998-tcsr
 -          - qcom,qcs404-tcsr
 -          - qcom,sc7180-tcsr
 -          - qcom,sc7280-tcsr
 -          - qcom,sdm630-tcsr
 -          - qcom,sdm845-tcsr
 -          - qcom,sm8150-tcsr
 -          - qcom,tcsr-apq8064
 -          - qcom,tcsr-apq8084
 -          - qcom,tcsr-ipq6018
 -          - qcom,tcsr-ipq8064
 -          - qcom,tcsr-mdm9615
 -          - qcom,tcsr-msm8660
 -          - qcom,tcsr-msm8916
 -          - qcom,tcsr-msm8953
 -          - qcom,tcsr-msm8960
 -          - qcom,tcsr-msm8974
 -          - qcom,tcsr-msm8996
 -      - const: syscon
 +    oneOf:
 +      - items:
 +          - enum:
 +              - qcom,msm8998-tcsr
 +              - qcom,qcs404-tcsr
 +              - qcom,sc7180-tcsr
 +              - qcom,sc7280-tcsr
 +              - qcom,sdm630-tcsr
 +              - qcom,sdm845-tcsr
 +              - qcom,sm8150-tcsr
 +              - qcom,tcsr-apq8064
 +              - qcom,tcsr-apq8084
 +              - qcom,tcsr-ipq8064
 +              - qcom,tcsr-mdm9615
 +              - qcom,tcsr-msm8660
 +              - qcom,tcsr-msm8916
 +              - qcom,tcsr-msm8953
 +              - qcom,tcsr-msm8960
 +              - qcom,tcsr-msm8974
 +              - qcom,tcsr-msm8996
 +          - const: syscon
-       - items:
-           - const: qcom,tcsr-ipq6018
-           - const: syscon
-           - const: simple-mfd
  
    reg:
      maxItems: 1