From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miquel Raynal <miquel.raynal@bootlin•com>,
Boris Brezillon <boris.brezillon@collabora•com>,
Richard Weinberger <richard.weinberger@gmail•com>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Rafał Miłecki" <rafal@milecki•pl>
Subject: linux-next: manual merge of the nand tree with the mtd tree
Date: Fri, 18 Nov 2022 11:45:46 +1100 [thread overview]
Message-ID: <20221118114546.3ac3521e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2661 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-11-18 0:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 0:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 1:55 linux-next: manual merge of the nand tree with the mtd tree Stephen Rothwell
2023-08-21 7:27 ` Miquel Raynal
2022-02-21 13:55 broonie
2022-02-21 14:16 ` Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221118114546.3ac3521e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boris.brezillon@collabora$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miquel.raynal@bootlin$(echo .)com \
--cc=rafal@milecki$(echo .)pl \
--cc=richard.weinberger@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox