linux-next: manual merge of the i2c-host tree with the origin tree

[Mark Brown]

Hi all,

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

  Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

between commit:

  880977fdc7f67 ("dt-bindings: i2c: qcom-cci: Document SM8750 compatible")

from the origin tree and commit:

  eddfdab4de202 ("dt-bindings: i2c: qcom-cci: Document qcs8300 compatible")

from the i2c-host 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/i2c/qcom,i2c-cci.yaml
index a3fe1eea6aece,f1919f59d521c..0000000000000
--- a/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
+++ b/Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
@@@ -133,7 -133,7 +134,8 @@@ allOf
              enum:
                - qcom,kaanapali-cci
                - qcom,qcm2290-cci
+               - qcom,qcs8300-cci
 +              - qcom,sm8750-cci
      then:
        properties:
          clocks:

Attachment: signature.asc
Description: PGP signature