linux-next: manual merge of the phy-next tree with the v4l-dvb tree

[Mark Brown]

Hi all,

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

  Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml

between commits:

  42b96f94929c9 ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")
  a93b9de71466f ("dt-bindings: phy: qcom,x1e80100-csi2-phy: Add Glymur compatible")

from the v4l-dvb tree and commit:

  3b0140f37d25b ("dt-bindings: phy: qcom: Add CSI2 C-PHY/DPHY schema")

from the phy-next 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 --combined Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
index 1f1e2a4993b2a,dc64af97da6c6..0000000000000
--- a/Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml
@@@ -16,11 -16,7 +16,11 @@@ description
  
  properties:
    compatible:
 -    const: qcom,x1e80100-csi2-phy
 +    oneOf:
 +      - const: qcom,x1e80100-csi2-phy
 +      - items:
 +          - const: qcom,glymur-csi2-phy
 +          - const: qcom,x1e80100-csi2-phy
  
    reg:
      maxItems: 1

Attachment: signature.asc
Description: PGP signature