Subject: linux-next: manual merge of the devicetree tree with the nand tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 May 2020 14:52:05 +1000

Hi all,

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

  Documentation/devicetree/bindings/mtd/nand-controller.yaml

between commit:

  1777341d9335 ("dt-bindings: mtd: Deprecate OOB_FIRST mode")

from the nand tree and commit:

  3d21a4609335 ("dt-bindings: Remove cases of 'allOf' containing a '$ref'")

from the devicetree 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/mtd/nand-controller.yaml
index d529f8587ba6,cde7c4d79efe..000000000000
--- a/Documentation/devicetree/bindings/mtd/nand-controller.yaml
+++ b/Documentation/devicetree/bindings/mtd/nand-controller.yaml
@@@ -55,21 -52,21 +52,21 @@@ patternProperties
            embedded in the NAND controller) or software correction
            (Linux will handle the calculations). soft_bch is deprecated
            and should be replaced by soft and nand-ecc-algo.
+         $ref: /schemas/types.yaml#/definitions/string
 -        enum: [none, soft, hw, hw_syndrome, hw_oob_first, on-die]
++        enum: [none, soft, hw, hw_syndrome, on-die]
  
        nand-ecc-algo:
-         allOf:
-           - $ref: /schemas/types.yaml#/definitions/string
-           - enum: [ hamming, bch, rs ]
          description:
            Desired ECC algorithm.
+         $ref: /schemas/types.yaml#/definitions/string
+         enum: [hamming, bch, rs]
  
        nand-bus-width:
-         allOf:
-           - $ref: /schemas/types.yaml#/definitions/uint32
-           - enum: [ 8, 16 ]
-           - default: 8
          description:
            Bus width to the NAND chip
+         $ref: /schemas/types.yaml#/definitions/uint32
+         enum: [8, 16]
+         default: 8
  
        nand-on-flash-bbt:
          $ref: /schemas/types.yaml#/definitions/flag