diff for duplicates of <57285162.2000704@schinagl.nl> diff --git a/a/1.txt b/N1/1.txt index fa6eadf..b3731dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ Hey Chen, On 03-05-16 05:33, Chen-Yu Tsai wrote: > Hi, > -> On Thu, Apr 28, 2016 at 3:19 PM, Olliver Schinagl <oliver@schinagl.nl> wrote: +> On Thu, Apr 28, 2016 at 3:19 PM, Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> wrote: >> There are 3 kinds of OLinuXino Lime2 boards. >> One without any on board storage, one with NAND storage and one with >> eMMC storage. This patch adds the eMMC variant of boards. @@ -12,7 +12,7 @@ On 03-05-16 05:33, Chen-Yu Tsai wrote: >> on the board and cannot be changed. Additionally, it shares pins with >> the NAND module and with the second SPI port. >> ->> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> +>> Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> >> --- >> .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 64 ++++++++++++++++++++++ >> 1 file changed, 64 insertions(+) @@ -26,7 +26,7 @@ On 03-05-16 05:33, Chen-Yu Tsai wrote: >> @@ -0,0 +1,64 @@ >> + /* >> + * Copyright 2015 - Ultimaker B.V. ->> + * Author Olliver Schinagl <oliver@schinagl.nl> +>> + * Author Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> >> + * >> + * This file is dual-licensed: you can use it either under the terms >> + * of the GPL or the X11 license, at your option. Note that this dual @@ -95,7 +95,7 @@ That was not supposed to be there, i'll fix it! Sorry. > >> + status = "okay"; >> + ->> + emmc: emmc at 0 { +>> + emmc: emmc@0 { >> + reg = <0>; >> + compatible = "mmc-card"; >> + broken-hpi; diff --git a/a/content_digest b/N1/content_digest index 746151a..d730ada 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,22 @@ "ref\01461827998-12192-1-git-send-email-oliver@schinagl.nl\0" "ref\0CAGb2v66E2TuN3+tYaAbniV3q67waDZOfqKAW14VJz6xZFomZ=Q@mail.gmail.com\0" - "From\0oliver@schinagl.nl (Olliver Schinagl)\0" - "Subject\0[PATCH 1/1] ARM: dts: sunxi: Add a olinuxino-lime2-emmc\0" + "From\0Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\0" + "Subject\0Re: [PATCH 1/1] ARM: dts: sunxi: Add a olinuxino-lime2-emmc\0" "Date\0Tue, 3 May 2016 09:21:06 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\0" + "Cc\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Tsvetan Usunov <tsvetan-kyXcfZUBQGPQT0dZR+AlfA@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> + dev <dev-3kdeTeqwOZ9EV1b7eY7vFQ@public.gmane.org> + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + " linux-kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" "\00:1\0" "b\0" "Hey Chen,\n" @@ -11,7 +24,7 @@ "On 03-05-16 05:33, Chen-Yu Tsai wrote:\n" "> Hi,\n" ">\n" - "> On Thu, Apr 28, 2016 at 3:19 PM, Olliver Schinagl <oliver@schinagl.nl> wrote:\n" + "> On Thu, Apr 28, 2016 at 3:19 PM, Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> wrote:\n" ">> There are 3 kinds of OLinuXino Lime2 boards.\n" ">> One without any on board storage, one with NAND storage and one with\n" ">> eMMC storage. This patch adds the eMMC variant of boards.\n" @@ -20,7 +33,7 @@ ">> on the board and cannot be changed. Additionally, it shares pins with\n" ">> the NAND module and with the second SPI port.\n" ">>\n" - ">> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>\n" + ">> Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\n" ">> ---\n" ">> .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 64 ++++++++++++++++++++++\n" ">> 1 file changed, 64 insertions(+)\n" @@ -34,7 +47,7 @@ ">> @@ -0,0 +1,64 @@\n" ">> + /*\n" ">> + * Copyright 2015 - Ultimaker B.V.\n" - ">> + * Author Olliver Schinagl <oliver@schinagl.nl>\n" + ">> + * Author Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\n" ">> + *\n" ">> + * This file is dual-licensed: you can use it either under the terms\n" ">> + * of the GPL or the X11 license, at your option. Note that this dual\n" @@ -103,7 +116,7 @@ ">\n" ">> + status = \"okay\";\n" ">> +\n" - ">> + emmc: emmc at 0 {\n" + ">> + emmc: emmc@0 {\n" ">> + reg = <0>;\n" ">> + compatible = \"mmc-card\";\n" ">> + broken-hpi;\n" @@ -113,4 +126,4 @@ ">> 2.8.0.rc3\n" >> -3f54238ac1d6bca2277552b6f014697f248e8a62e91423d43412bcb9e575a561 +3ec462bca79610cb8929280fe0fe3dfc872d9c301effb9b58e0ca91b033ad903
diff --git a/a/1.txt b/N2/1.txt index fa6eadf..fa8155b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -95,7 +95,7 @@ That was not supposed to be there, i'll fix it! Sorry. > >> + status = "okay"; >> + ->> + emmc: emmc at 0 { +>> + emmc: emmc@0 { >> + reg = <0>; >> + compatible = "mmc-card"; >> + broken-hpi; diff --git a/a/content_digest b/N2/content_digest index 746151a..5a795dd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,22 @@ "ref\01461827998-12192-1-git-send-email-oliver@schinagl.nl\0" "ref\0CAGb2v66E2TuN3+tYaAbniV3q67waDZOfqKAW14VJz6xZFomZ=Q@mail.gmail.com\0" - "From\0oliver@schinagl.nl (Olliver Schinagl)\0" - "Subject\0[PATCH 1/1] ARM: dts: sunxi: Add a olinuxino-lime2-emmc\0" + "From\0Olliver Schinagl <oliver@schinagl.nl>\0" + "Subject\0Re: [PATCH 1/1] ARM: dts: sunxi: Add a olinuxino-lime2-emmc\0" "Date\0Tue, 3 May 2016 09:21:06 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Chen-Yu Tsai <wens@csie.org>\0" + "Cc\0Maxime Ripard <maxime.ripard@free-electrons.com>" + Tsvetan Usunov <tsvetan@olimex.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Hans de Goede <hdegoede@redhat.com> + dev <dev@linux-sunxi.org> + devicetree <devicetree@vger.kernel.org> + linux-arm-kernel <linux-arm-kernel@lists.infradead.org> + " linux-kernel <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hey Chen,\n" @@ -103,7 +116,7 @@ ">\n" ">> + status = \"okay\";\n" ">> +\n" - ">> + emmc: emmc at 0 {\n" + ">> + emmc: emmc@0 {\n" ">> + reg = <0>;\n" ">> + compatible = \"mmc-card\";\n" ">> + broken-hpi;\n" @@ -113,4 +126,4 @@ ">> 2.8.0.rc3\n" >> -3f54238ac1d6bca2277552b6f014697f248e8a62e91423d43412bcb9e575a561 +a135553ab5f8fd92f51ed2969234b5d669f952241fc9a79e0170cf46d1453f58
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.