linux-next: manual merge of the nvmem tree with the char-misc tree

[Mark Brown]

Hi all,

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

  Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml

between commits:

  1123dc1ae35f8 ("dt-bindings: nvmem: qfprom: Add glymur compatible")
  ec4b806d0c7e6 ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
  ef558843eff49 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
  31a75f07b9e90 ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")

from the char-misc tree and commits:

  c33862c0a3a9a ("dt-bindings: nvmem: qfprom: Add glymur compatible")
  c896d1c34f2bb ("dt-bindings: nvmem: qfprom: qcom: Add Hawi compatible")
  9f902e68cfe33 ("dt-bindings: nvmem: qfprom: Add Milos compatible")
  ac0a5d17aa3cc ("dt-bindings: nvmem: qcom,qfprom: Add Shikra compatible")
  a0366c432e838 ("dt-bindings: nvmem: qfprom: Add ipq5210 & ipq9650 compatible")
  314ac2403ac96 ("dt-bindings: nvmem: qfprom: Add compatible for Qualcomm Maili")

from the nvmem 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/nvmem/qcom,qfprom.yaml
index 8134ddb54e130,566304ed4c786..0000000000000
--- a/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
+++ b/Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
@@@ -22,13 -22,16 +22,16 @@@ properties
            - qcom,glymur-qfprom
            - qcom,hawi-qfprom
            - qcom,ipq5018-qfprom
+           - qcom,ipq5210-qfprom
            - qcom,ipq5332-qfprom
            - qcom,ipq5424-qfprom
            - qcom,ipq6018-qfprom
            - qcom,ipq8064-qfprom
            - qcom,ipq8074-qfprom
            - qcom,ipq9574-qfprom
+           - qcom,ipq9650-qfprom
            - qcom,kaanapali-qfprom
+           - qcom,maili-qfprom
            - qcom,milos-qfprom
            - qcom,msm8226-qfprom
            - qcom,msm8916-qfprom

Attachment: signature.asc
Description: PGP signature