diff for duplicates of <20171018143629.29302-9-miquel.raynal@free-electrons.com>
diff --git a/a/content_digest b/N1/content_digest
index 7110a70..f66f8c7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -33,34 +33,16 @@
" linux-arm-kernel\@lists.infradead.org",
" linux-kernel\@vger.kernel.org",
" linux-mediatek\@lists.infradead.org",
- " linux-mtd\@lists.infradead.org",
- " Marc Gonzalez <marc_gonzalez\@sigmadesigns.com>",
- " Marek Vasut <marek.vasut\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " Matthias Brugger <matthias.bgg\@gmail.com>",
- " Maxime Ripard <maxime.ripard\@free-electrons.com>",
- " Maxim Levitsky <maximlevitsky\@gmail.com>",
- " Richard Weinberger <richard\@nod.at>",
- " Robert Jarzmik <robert.jarzmik\@free.fr>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@armlinux.org.uk>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Stefan Agner <stefan\@agner.ch>",
- " Sylvain Lemieux <slemieux.tyco\@gmail.com>",
- " Vladimir Zapolskiy <vz\@mleia.com>",
- " Wenyou Yang <wenyou.yang\@atmel.com>",
- " Will Deacon <will.deacon\@arm.com>\0"
+ " linux-mtd\@lists.infradead.org\0"
]
[
- "Cc\0Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
+ "Cc\0Hanna Hawa <hannah\@marvell.com>",
" Antoine Tenart <antoine.tenart\@free-electrons.com>",
- " Miquel Raynal <miquel.raynal\@free-electrons.com>",
- " Igor Grinberg <grinberg\@compulab.co.il>",
" Nadav Haklai <nadavh\@marvell.com>",
- " Ofer Heifetz <oferh\@marvell.com>",
" Neta Zur Hershkovits <neta\@marvell.com>",
- " Hanna Hawa <hannah\@marvell.com>\0"
+ " Igor Grinberg <grinberg\@compulab.co.il>",
+ " Miquel Raynal <miquel.raynal\@free-electrons.com>",
+ " Ofer Heifetz <oferh\@marvell.com>\0"
]
[
"\0000:1\0"
@@ -168,4 +150,4 @@
"2.11.0"
]
-72f2ceea342708b5a994aa4346529c048a484e181e81fdf49b560c5cc1cbbff2
+187b5d0efed37c96753d547a69d5c320ad92c9fd102b0bc390ed23e4f60d1eb3
diff --git a/a/1.txt b/N2/1.txt
index 3e4c6b8..4e28bee 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -33,19 +33,19 @@ index bcdbb8ba1d65..42277a554063 100644
- nand-ecc-strength = <4>;
- nand-ecc-step-size = <512>;
-
-- partition@0 {
+- partition at 0 {
- label = "U-Boot";
- reg = <0 0x800000>;
- };
-- partition@800000 {
+- partition at 800000 {
- label = "Linux";
- reg = <0x800000 0x800000>;
- };
-- partition@1000000 {
+- partition at 1000000 {
- label = "Filesystem";
- reg = <0x1000000 0x3f000000>;
+
-+ nand@0 {
++ nand at 0 {
+ reg = <0>;
+ marvell,rb = <0>;
+ marvell,nand-keep-config;
@@ -58,15 +58,15 @@ index bcdbb8ba1d65..42277a554063 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ partition@0 {
++ partition at 0 {
+ label = "U-Boot";
+ reg = <0 0x800000>;
+ };
-+ partition@800000 {
++ partition at 800000 {
+ label = "Linux";
+ reg = <0x800000 0x800000>;
+ };
-+ partition@1000000 {
++ partition at 1000000 {
+ label = "Filesystem";
+ reg = <0x1000000 0x3f000000>;
+ };
@@ -82,9 +82,9 @@ index 7225c7ce9a8d..db66b5f29834 100644
status = "disabled";
};
-- nand: nand@d0000 {
+- nand: nand at d0000 {
- compatible = "marvell,armada370-nand";
-+ nand_controller: nand-controller@d0000 {
++ nand_controller: nand-controller at d0000 {
+ compatible = "marvell,armada370-nand-controller";
reg = <0xd0000 0x54>;
#address-cells = <1>;
diff --git a/a/content_digest b/N2/content_digest
index 7110a70..0106d0f 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020171018143629.29302-1-miquel.raynal\@free-electrons.com\0"
]
[
- "From\0Miquel Raynal <miquel.raynal\@free-electrons.com>\0"
+ "From\0miquel.raynal\@free-electrons.com (Miquel Raynal)\0"
]
[
"Subject\0[RFC 08/12] ARM: dts: armada-375: use reworked NAND controller driver\0"
@@ -11,56 +11,7 @@
"Date\0Wed, 18 Oct 2017 16:36:25 +0200\0"
]
[
- "To\0Andrew Lunn <andrew\@lunn.ch>",
- " bcm-kernel-feedback-list\@broadcom.com",
- " Boris Brezillon <boris.brezillon\@free-electrons.com>",
- " Brian Norris <computersforpeace\@gmail.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Chen-Yu Tsai <wens\@csie.org>",
- " Cyrille Pitchen <cyrille.pitchen\@wedev4u.fr>",
- " Daniel Mack <daniel\@zonque.org>",
- " David Woodhouse <dwmw2\@infradead.org>",
- " devel\@driverdev.osuosl.org",
- " devicetree\@vger.kernel.org",
- " Ezequiel Garcia <ezequiel.garcia\@free-electrons.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Gregory Clement <gregory.clement\@free-electrons.com>",
- " Han Xu <han.xu\@nxp.com>",
- " Haojian Zhuang <haojian.zhuang\@gmail.com>",
- " Jason Cooper <jason\@lakedaemon.net>",
- " Josh Wu <rainyfeeling\@outlook.com>",
- " Kamal Dasu <kdasu.kdev\@gmail.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " linux-mediatek\@lists.infradead.org",
- " linux-mtd\@lists.infradead.org",
- " Marc Gonzalez <marc_gonzalez\@sigmadesigns.com>",
- " Marek Vasut <marek.vasut\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " Matthias Brugger <matthias.bgg\@gmail.com>",
- " Maxime Ripard <maxime.ripard\@free-electrons.com>",
- " Maxim Levitsky <maximlevitsky\@gmail.com>",
- " Richard Weinberger <richard\@nod.at>",
- " Robert Jarzmik <robert.jarzmik\@free.fr>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Russell King <linux\@armlinux.org.uk>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Stefan Agner <stefan\@agner.ch>",
- " Sylvain Lemieux <slemieux.tyco\@gmail.com>",
- " Vladimir Zapolskiy <vz\@mleia.com>",
- " Wenyou Yang <wenyou.yang\@atmel.com>",
- " Will Deacon <will.deacon\@arm.com>\0"
-]
-[
- "Cc\0Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
- " Antoine Tenart <antoine.tenart\@free-electrons.com>",
- " Miquel Raynal <miquel.raynal\@free-electrons.com>",
- " Igor Grinberg <grinberg\@compulab.co.il>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Ofer Heifetz <oferh\@marvell.com>",
- " Neta Zur Hershkovits <neta\@marvell.com>",
- " Hanna Hawa <hannah\@marvell.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -104,19 +55,19 @@
"-\tnand-ecc-strength = <4>;\n",
"-\tnand-ecc-step-size = <512>;\n",
"-\n",
- "-\tpartition\@0 {\n",
+ "-\tpartition at 0 {\n",
"-\t\tlabel = \"U-Boot\";\n",
"-\t\treg = <0 0x800000>;\n",
"-\t};\n",
- "-\tpartition\@800000 {\n",
+ "-\tpartition at 800000 {\n",
"-\t\tlabel = \"Linux\";\n",
"-\t\treg = <0x800000 0x800000>;\n",
"-\t};\n",
- "-\tpartition\@1000000 {\n",
+ "-\tpartition at 1000000 {\n",
"-\t\tlabel = \"Filesystem\";\n",
"-\t\treg = <0x1000000 0x3f000000>;\n",
"+\n",
- "+\tnand\@0 {\n",
+ "+\tnand at 0 {\n",
"+\t\treg = <0>;\n",
"+\t\tmarvell,rb = <0>;\n",
"+\t\tmarvell,nand-keep-config;\n",
@@ -129,15 +80,15 @@
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\tpartition\@0 {\n",
+ "+\t\t\tpartition at 0 {\n",
"+\t\t\t\tlabel = \"U-Boot\";\n",
"+\t\t\t\treg = <0 0x800000>;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@800000 {\n",
+ "+\t\t\tpartition at 800000 {\n",
"+\t\t\t\tlabel = \"Linux\";\n",
"+\t\t\t\treg = <0x800000 0x800000>;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@1000000 {\n",
+ "+\t\t\tpartition at 1000000 {\n",
"+\t\t\t\tlabel = \"Filesystem\";\n",
"+\t\t\t\treg = <0x1000000 0x3f000000>;\n",
"+\t\t\t};\n",
@@ -153,9 +104,9 @@
" \t\t\t\tstatus = \"disabled\";\n",
" \t\t\t};\n",
" \n",
- "-\t\t\tnand: nand\@d0000 {\n",
+ "-\t\t\tnand: nand at d0000 {\n",
"-\t\t\t\tcompatible = \"marvell,armada370-nand\";\n",
- "+\t\t\tnand_controller: nand-controller\@d0000 {\n",
+ "+\t\t\tnand_controller: nand-controller at d0000 {\n",
"+\t\t\t\tcompatible = \"marvell,armada370-nand-controller\";\n",
" \t\t\t\treg = <0xd0000 0x54>;\n",
" \t\t\t\t#address-cells = <1>;\n",
@@ -168,4 +119,4 @@
"2.11.0"
]
-72f2ceea342708b5a994aa4346529c048a484e181e81fdf49b560c5cc1cbbff2
+2f74175ef05b1757ceb4379ed8b837a4312931eecedba46175f20a51b89d3047
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.