diff for duplicates of <20160810092946.GG16481@gobelin> diff --git a/a/1.txt b/N1/1.txt index 51e124a..427337c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,7 +63,7 @@ Karl > + > + ti,cs-chipselect = <2>; > + -> + nand at 2000000,0 { +> + nand@2000000,0 { > + compatible = "ti,davinci-nand"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -120,16 +120,16 @@ Karl > + #address-cells = <1>; > + #size-cells = <1>; > + -> + partition at 0 { +> + partition@0 { > + label = "u-boot env"; > + reg = <0 0x020000>; > + }; -> + partition at 0x020000 { +> + partition@0x020000 { > + /* The LCDK defaults to booting from this partition */ > + label = "u-boot"; > + reg = <0x020000 0x080000>; > + }; -> + partition at 0x0a0000 { +> + partition@0x0a0000 { > + label = "space"; > + reg = <0x0a0000 0>; > + }; diff --git a/a/content_digest b/N1/content_digest index 157a4bc..e113e36 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,18 @@ "ref\020160809171518.22690-1-kbeldan@baylibre.com\0" "ref\020160809171518.22690-4-kbeldan@baylibre.com\0" - "From\0kbeldan@baylibre.com (Karl Beldan)\0" - "Subject\0[PATCH 3/4] ARM: dts: da850-lcdk: Add NAND to DT\0" + "From\0Karl Beldan <kbeldan@baylibre.com>\0" + "Subject\0Re: [PATCH 3/4] ARM: dts: da850-lcdk: Add NAND to DT\0" "Date\0Wed, 10 Aug 2016 09:29:46 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + Karl Beldan <karl.beldan+oss@gmail.com> + Kevin Hilman <khilman@baylibre.com> + Sekhar Nori <nsekhar@ti.com> + linux-kernel@vger.kernel.org + Russell King <linux@armlinux.org.uk> + Rob Herring <robh+dt@kernel.org> + " Santosh Shilimkar <ssantosh@kernel.org>\0" "\00:1\0" "b\0" "On Tue, Aug 09, 2016 at 05:15:17PM +0000, Karl Beldan wrote:\n" @@ -71,7 +80,7 @@ "> +\n" "> +\t\tti,cs-chipselect = <2>;\n" "> +\n" - "> +\t\tnand at 2000000,0 {\n" + "> +\t\tnand@2000000,0 {\n" "> +\t\t\tcompatible = \"ti,davinci-nand\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -128,16 +137,16 @@ "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <1>;\n" "> +\n" - "> +\t\t\t\tpartition at 0 {\n" + "> +\t\t\t\tpartition@0 {\n" "> +\t\t\t\t\tlabel = \"u-boot env\";\n" "> +\t\t\t\t\treg = <0 0x020000>;\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tpartition at 0x020000 {\n" + "> +\t\t\t\tpartition@0x020000 {\n" "> +\t\t\t\t\t/* The LCDK defaults to booting from this partition */\n" "> +\t\t\t\t\tlabel = \"u-boot\";\n" "> +\t\t\t\t\treg = <0x020000 0x080000>;\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tpartition at 0x0a0000 {\n" + "> +\t\t\t\tpartition@0x0a0000 {\n" "> +\t\t\t\t\tlabel = \"space\";\n" "> +\t\t\t\t\treg = <0x0a0000 0>;\n" "> +\t\t\t\t};\n" @@ -149,4 +158,4 @@ "> 2.9.2\n" > -d6e7f6093fa4a2ffc70f0e7d320a94a7f36f6799724b037e965e31cf7f9656a8 +3ac9f95a20b44ac81f431399de7272be18cbbc42f522e33e1e0758abf64cfa6d
diff --git a/a/1.txt b/N2/1.txt index 51e124a..427337c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -63,7 +63,7 @@ Karl > + > + ti,cs-chipselect = <2>; > + -> + nand at 2000000,0 { +> + nand@2000000,0 { > + compatible = "ti,davinci-nand"; > + #address-cells = <1>; > + #size-cells = <1>; @@ -120,16 +120,16 @@ Karl > + #address-cells = <1>; > + #size-cells = <1>; > + -> + partition at 0 { +> + partition@0 { > + label = "u-boot env"; > + reg = <0 0x020000>; > + }; -> + partition at 0x020000 { +> + partition@0x020000 { > + /* The LCDK defaults to booting from this partition */ > + label = "u-boot"; > + reg = <0x020000 0x080000>; > + }; -> + partition at 0x0a0000 { +> + partition@0x0a0000 { > + label = "space"; > + reg = <0x0a0000 0>; > + }; diff --git a/a/content_digest b/N2/content_digest index 157a4bc..ad0fb80 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,18 @@ "ref\020160809171518.22690-1-kbeldan@baylibre.com\0" "ref\020160809171518.22690-4-kbeldan@baylibre.com\0" - "From\0kbeldan@baylibre.com (Karl Beldan)\0" - "Subject\0[PATCH 3/4] ARM: dts: da850-lcdk: Add NAND to DT\0" + "From\0Karl Beldan <kbeldan@baylibre.com>\0" + "Subject\0Re: [PATCH 3/4] ARM: dts: da850-lcdk: Add NAND to DT\0" "Date\0Wed, 10 Aug 2016 09:29:46 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" + "Cc\0linux-kernel@vger.kernel.org" + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Russell King <linux@armlinux.org.uk> + Santosh Shilimkar <ssantosh@kernel.org> + Sekhar Nori <nsekhar@ti.com> + Kevin Hilman <khilman@baylibre.com> + " Karl Beldan <karl.beldan+oss@gmail.com>\0" "\00:1\0" "b\0" "On Tue, Aug 09, 2016 at 05:15:17PM +0000, Karl Beldan wrote:\n" @@ -71,7 +80,7 @@ "> +\n" "> +\t\tti,cs-chipselect = <2>;\n" "> +\n" - "> +\t\tnand at 2000000,0 {\n" + "> +\t\tnand@2000000,0 {\n" "> +\t\t\tcompatible = \"ti,davinci-nand\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" @@ -128,16 +137,16 @@ "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <1>;\n" "> +\n" - "> +\t\t\t\tpartition at 0 {\n" + "> +\t\t\t\tpartition@0 {\n" "> +\t\t\t\t\tlabel = \"u-boot env\";\n" "> +\t\t\t\t\treg = <0 0x020000>;\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tpartition at 0x020000 {\n" + "> +\t\t\t\tpartition@0x020000 {\n" "> +\t\t\t\t\t/* The LCDK defaults to booting from this partition */\n" "> +\t\t\t\t\tlabel = \"u-boot\";\n" "> +\t\t\t\t\treg = <0x020000 0x080000>;\n" "> +\t\t\t\t};\n" - "> +\t\t\t\tpartition at 0x0a0000 {\n" + "> +\t\t\t\tpartition@0x0a0000 {\n" "> +\t\t\t\t\tlabel = \"space\";\n" "> +\t\t\t\t\treg = <0x0a0000 0>;\n" "> +\t\t\t\t};\n" @@ -149,4 +158,4 @@ "> 2.9.2\n" > -d6e7f6093fa4a2ffc70f0e7d320a94a7f36f6799724b037e965e31cf7f9656a8 +f5cee4cb22278dce133d9c61d371b860e304e99a5f0adae5465fa3a9e486aebc
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.