linux-next: manual merge of the nand tree with the mtd tree

[Stephen Rothwell]

Hi all,

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

  Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml

between commit:

  74f4d7974d2f ("dt-bindings: mtd: Standardize the style in the examples")

from the mtd tree and commit:

  075e181fba72 ("dt-bindings: mtd: brcm,brcmnand: update interrupts description")

from the nand 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/brcm,brcmnand.yaml
index f9518d39fbbd,cd606a21b53b..1571024aa119
--- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
+++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
@@@ -184,26 -191,27 +191,27 @@@ required
  examples:
    - |
      nand-controller@f0442800 {
 -            compatible = "brcm,brcmnand-v7.0", "brcm,brcmnand";
 -            reg = <0xf0442800 0x600>,
 -                  <0xf0443000 0x100>;
 -            reg-names = "nand", "flash-dma";
 -            interrupt-parent = <&hif_intr2_intc>;
 -            interrupts = <24>, <4>;
 -            interrupt-names = "nand_ctlrdy", "flash_dma_done";
 +        compatible = "brcm,brcmnand-v7.0", "brcm,brcmnand";
 +        reg = <0xf0442800 0x600>,
 +              <0xf0443000 0x100>;
 +        reg-names = "nand", "flash-dma";
 +        interrupt-parent = <&hif_intr2_intc>;
 +        interrupts = <24>, <4>;
++        interrupt-names = "nand_ctlrdy", "flash_dma_done";
 +
 +        #address-cells = <1>;
 +        #size-cells = <0>;
 +
 +        nand@1 {
 +            compatible = "brcm,nandcs";
 +            reg = <1>; // Chip select 1
 +            nand-on-flash-bbt;
 +            nand-ecc-strength = <12>;
 +            nand-ecc-step-size = <512>;
  
              #address-cells = <1>;
 -            #size-cells = <0>;
 -
 -            nand@1 {
 -                    compatible = "brcm,nandcs";
 -                    reg = <1>; // Chip select 1
 -                    nand-on-flash-bbt;
 -                    nand-ecc-strength = <12>;
 -                    nand-ecc-step-size = <512>;
 -
 -                    #address-cells = <1>;
 -                    #size-cells = <1>;
 -            };
 +            #size-cells = <1>;
 +        };
      };
    - |
      nand-controller@10000200 {

Attachment: pgpY0m2yM2kYX.pgp
Description: OpenPGP digital signature