diff for duplicates of <54954E77.4070302@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 60a8d3c..6170a5c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ On 19-12-14 19:34, Maxime Ripard wrote: >> simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to >> reflect the different package, everything else is identical. >> ->> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> >> --- >> Changes in v2: >> -include sun6i-a31.dtsi and override the pinctrl compatible, rather then @@ -25,7 +25,7 @@ On 19-12-14 19:34, Maxime Ripard wrote: >> +++ b/arch/arm/boot/dts/sun6i-a31s.dtsi >> @@ -0,0 +1,62 @@ >> +/* ->> + * Copyright 2014 Hans de Goede <hdegoede@redhat.com> +>> + * Copyright 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@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 @@ -80,8 +80,8 @@ On 19-12-14 19:34, Maxime Ripard wrote: >> +/include/ "sun6i-a31.dtsi" >> + >> +/ { ->> + soc at 01c00000 { ->> + pio: pinctrl at 01c20800 { +>> + soc@01c00000 { +>> + pio: pinctrl@01c20800 { >> + compatible = "allwinner,sun6i-a31s-pinctrl"; >> + }; >> + }; diff --git a/a/content_digest b/N1/content_digest index 0d2f402..fb1ab39 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,18 @@ "ref\01418836704-15689-1-git-send-email-hdegoede@redhat.com\0" "ref\01418836704-15689-13-git-send-email-hdegoede@redhat.com\0" "ref\020141219183450.GZ4820@lukather\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[PATCH v2 12/13] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" + "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 12/13] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" "Date\0Sat, 20 Dec 2014 11:24:55 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Linux Media Mailing List <linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -17,7 +25,7 @@ ">> simply includes sun6i-a31.dtsi and then overrides the pinctrl compatible to\n" ">> reflect the different package, everything else is identical.\n" ">>\n" - ">> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + ">> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" ">> ---\n" ">> Changes in v2:\n" ">> -include sun6i-a31.dtsi and override the pinctrl compatible, rather then\n" @@ -34,7 +42,7 @@ ">> +++ b/arch/arm/boot/dts/sun6i-a31s.dtsi\n" ">> @@ -0,0 +1,62 @@\n" ">> +/*\n" - ">> + * Copyright 2014 Hans de Goede <hdegoede@redhat.com>\n" + ">> + * Copyright 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@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" @@ -89,8 +97,8 @@ ">> +/include/ \"sun6i-a31.dtsi\"\n" ">> +\n" ">> +/ {\n" - ">> +\tsoc at 01c00000 {\n" - ">> +\t\tpio: pinctrl at 01c20800 {\n" + ">> +\tsoc@01c00000 {\n" + ">> +\t\tpio: pinctrl@01c20800 {\n" ">> +\t\t\tcompatible = \"allwinner,sun6i-a31s-pinctrl\";\n" ">> +\t\t};\n" ">> +\t};\n" @@ -123,4 +131,4 @@ "\n" Hans -53d89a784c133a703acd2808e01187163f1bb028400104b9971260ac8dae5387 +ebf5c3d7ca1b4ab299e031578545ab1dddadb6141ec55fd4afd72e795e5765d2
diff --git a/a/1.txt b/N2/1.txt index 60a8d3c..62a02b5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -80,8 +80,8 @@ On 19-12-14 19:34, Maxime Ripard wrote: >> +/include/ "sun6i-a31.dtsi" >> + >> +/ { ->> + soc at 01c00000 { ->> + pio: pinctrl at 01c20800 { +>> + soc@01c00000 { +>> + pio: pinctrl@01c20800 { >> + compatible = "allwinner,sun6i-a31s-pinctrl"; >> + }; >> + }; diff --git a/a/content_digest b/N2/content_digest index 0d2f402..1bd566b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,18 @@ "ref\01418836704-15689-1-git-send-email-hdegoede@redhat.com\0" "ref\01418836704-15689-13-git-send-email-hdegoede@redhat.com\0" "ref\020141219183450.GZ4820@lukather\0" - "From\0hdegoede@redhat.com (Hans de Goede)\0" - "Subject\0[PATCH v2 12/13] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" + "From\0Hans de Goede <hdegoede@redhat.com>\0" + "Subject\0Re: [PATCH v2 12/13] ARM: dts: sun6i: Add sun6i-a31s.dtsi\0" "Date\0Sat, 20 Dec 2014 11:24:55 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Cc\0Linus Walleij <linus.walleij@linaro.org>" + Lee Jones <lee.jones@linaro.org> + Samuel Ortiz <sameo@linux.intel.com> + Mike Turquette <mturquette@linaro.org> + Linux Media Mailing List <linux-media@vger.kernel.org> + linux-arm-kernel@lists.infradead.org + devicetree <devicetree@vger.kernel.org> + " linux-sunxi@googlegroups.com\0" "\00:1\0" "b\0" "Hi,\n" @@ -89,8 +97,8 @@ ">> +/include/ \"sun6i-a31.dtsi\"\n" ">> +\n" ">> +/ {\n" - ">> +\tsoc at 01c00000 {\n" - ">> +\t\tpio: pinctrl at 01c20800 {\n" + ">> +\tsoc@01c00000 {\n" + ">> +\t\tpio: pinctrl@01c20800 {\n" ">> +\t\t\tcompatible = \"allwinner,sun6i-a31s-pinctrl\";\n" ">> +\t\t};\n" ">> +\t};\n" @@ -123,4 +131,4 @@ "\n" Hans -53d89a784c133a703acd2808e01187163f1bb028400104b9971260ac8dae5387 +bbd9da9f754bedb196f2d5467b6ded0ff9bb1131f215bc583fed662bdda326bd
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.