* linux-next: manual merge of the devicetree tree with the nand tree
@ 2020-05-28 4:52 Stephen Rothwell
2020-05-28 7:15 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-05-28 4:52 UTC (permalink / raw)
To: Rob Herring, Miquel Raynal, Boris Brezillon
Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 2188 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the devicetree tree with the nand tree
2020-05-28 4:52 linux-next: manual merge of the devicetree tree with the nand tree Stephen Rothwell
@ 2020-05-28 7:15 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2020-05-28 7:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, Boris Brezillon, Linux Next Mailing List,
Linux Kernel Mailing List
Hi Stephen,
Stephen Rothwell <sfr@canb.auug.org.au> wrote on 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.
>
My change can wait, it's part of a preparation series for a bigger
rework that will come with 5.9 so I'll drop the patch for this release.
I already carry a much bigger release than usual, I don't want to
bother with merge conflicts. Thanks for the fix though!
Cheers,
Miquèl
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-28 7:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 4:52 linux-next: manual merge of the devicetree tree with the nand tree Stephen Rothwell
2020-05-28 7:15 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).