diff for duplicates of <5506EEF9.7080100@suse.de> diff --git a/a/1.txt b/N1/1.txt index 15e7b26..9083d13 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,22 +1,22 @@ Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas: > Hello Andreas, > -> On 02/18/2015 05:10 PM, Andreas Färber wrote: +> On 02/18/2015 05:10 PM, Andreas F?rber wrote: >> Resolve a merge conflict with mmc refactoring aaa25a5a33cb ("ARM: dts: >> unuse the slot-node and deprecate the supports-highspeed for dw-mmc in ->> exynos") by dropping the slot@0 nodes, moving its bus-width property to +>> exynos") by dropping the slot at 0 nodes, moving its bus-width property to >> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, >> matching exynos5250-snow. >> ->> Cc: Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> +>> Cc: Jaehoon Chung <jh80.chung@samsung.com> >> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") ->> Signed-off-by: Andreas Färber <afaerber-l3A5Bk7waGM@public.gmane.org> +>> Signed-off-by: Andreas F?rber <afaerber@suse.de> >> --- >> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ >> 1 file changed, 4 insertions(+), 12 deletions(-) >> > -> Reviewed-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8oXa1LcwEujcA@public.gmane.orgk> +> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Ping! @@ -25,10 +25,6 @@ Ping! > Javier -- -SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany -GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, -Graham Norton; HRB 21284 (AG Nürnberg) --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany +GF: Felix Imend?rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, +Graham Norton; HRB 21284 (AG N?rnberg) diff --git a/a/content_digest b/N1/content_digest index 93ef0dc..07806ca 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,46 +1,30 @@ "ref\01424275812-6797-1-git-send-email-afaerber@suse.de\0" "ref\054E5CD2E.9070608@collabora.co.uk\0" - "ref\054E5CD2E.9070608-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org\0" - "From\0Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>\0" - "Subject\0Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" + "From\0afaerber@suse.de (Andreas F\303\244rber)\0" + "Subject\0[PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" "Date\0Mon, 16 Mar 2015 15:55:53 +0100\0" - "To\0linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - " Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" - "Cc\0Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Vincent Palatin <vpalatin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Tomasz Figa <t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@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> - " LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas:\n" "> Hello Andreas,\n" "> \n" - "> On 02/18/2015 05:10 PM, Andreas F\303\244rber wrote:\n" + "> On 02/18/2015 05:10 PM, Andreas F?rber wrote:\n" ">> Resolve a merge conflict with mmc refactoring aaa25a5a33cb (\"ARM: dts:\n" ">> unuse the slot-node and deprecate the supports-highspeed for dw-mmc in\n" - ">> exynos\") by dropping the slot@0 nodes, moving its bus-width property to\n" + ">> exynos\") by dropping the slot at 0 nodes, moving its bus-width property to\n" ">> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed,\n" ">> matching exynos5250-snow.\n" ">>\n" - ">> Cc: Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\n" + ">> Cc: Jaehoon Chung <jh80.chung@samsung.com>\n" ">> Fixes: 53dd4138bb0a (\"ARM: dts: Add exynos5250-spring device tree\")\n" - ">> Signed-off-by: Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>\n" + ">> Signed-off-by: Andreas F?rber <afaerber@suse.de>\n" ">> ---\n" ">> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------\n" ">> 1 file changed, 4 insertions(+), 12 deletions(-)\n" ">>\n" "> \n" - "> Reviewed-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8oXa1LcwEujcA@public.gmane.orgk>\n" + "> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>\n" "\n" "Ping!\n" "\n" @@ -49,12 +33,8 @@ "> Javier\n" "\n" "-- \n" - "SUSE Linux GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" - "GF: Felix Imend\303\266rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,\n" - "Graham Norton; HRB 21284 (AG N\303\274rnberg)\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "SUSE Linux GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" + "GF: Felix Imend?rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,\n" + Graham Norton; HRB 21284 (AG N?rnberg) -5672b315a9bcf9d3ebda10a4409ed3724b76d8b6317295843a6424fb33606e8a +c2ba7b8315a63c678ed5cd23f0480fa594e11853cc52f0aafcaea52ed7fe8c6d
diff --git a/a/1.txt b/N2/1.txt index 15e7b26..ba65221 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,15 +8,15 @@ Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas: >> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed, >> matching exynos5250-snow. >> ->> Cc: Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> +>> Cc: Jaehoon Chung <jh80.chung@samsung.com> >> Fixes: 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") ->> Signed-off-by: Andreas Färber <afaerber-l3A5Bk7waGM@public.gmane.org> +>> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------ >> 1 file changed, 4 insertions(+), 12 deletions(-) >> > -> Reviewed-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8oXa1LcwEujcA@public.gmane.orgk> +> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Ping! @@ -28,7 +28,3 @@ Ping! SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG Nürnberg) --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 93ef0dc..72dbcc1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,24 @@ "ref\01424275812-6797-1-git-send-email-afaerber@suse.de\0" "ref\054E5CD2E.9070608@collabora.co.uk\0" - "ref\054E5CD2E.9070608-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org\0" - "From\0Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>\0" + "From\0Andreas F\303\244rber <afaerber@suse.de>\0" "Subject\0Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" "Date\0Mon, 16 Mar 2015 15:55:53 +0100\0" - "To\0linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - " Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" - "Cc\0Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>" - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Vincent Palatin <vpalatin-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Doug Anderson <dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Tomasz Figa <t.figa-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org> - Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@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> - " LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0linux-samsung-soc@vger.kernel.org" + " Kukjin Kim <kgene@kernel.org>\0" + "Cc\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>" + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + Vincent Palatin <vpalatin@chromium.org> + Doug Anderson <dianders@chromium.org> + Tomasz Figa <t.figa@samsung.com> + Jaehoon Chung <jh80.chung@samsung.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> + " LKML <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Am 19.02.2015 um 12:46 schrieb Javier Martinez Canillas:\n" @@ -32,15 +31,15 @@ ">> the mmc node and replacing supports-highspeed with cap-{mmc,sd}-highspeed,\n" ">> matching exynos5250-snow.\n" ">>\n" - ">> Cc: Jaehoon Chung <jh80.chung-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>\n" + ">> Cc: Jaehoon Chung <jh80.chung@samsung.com>\n" ">> Fixes: 53dd4138bb0a (\"ARM: dts: Add exynos5250-spring device tree\")\n" - ">> Signed-off-by: Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>\n" + ">> Signed-off-by: Andreas F\303\244rber <afaerber@suse.de>\n" ">> ---\n" ">> arch/arm/boot/dts/exynos5250-spring.dts | 16 ++++------------\n" ">> 1 file changed, 4 insertions(+), 12 deletions(-)\n" ">>\n" "> \n" - "> Reviewed-by: Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8oXa1LcwEujcA@public.gmane.orgk>\n" + "> Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>\n" "\n" "Ping!\n" "\n" @@ -51,10 +50,6 @@ "-- \n" "SUSE Linux GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" "GF: Felix Imend\303\266rffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,\n" - "Graham Norton; HRB 21284 (AG N\303\274rnberg)\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "Graham Norton; HRB 21284 (AG N\303\274rnberg)" -5672b315a9bcf9d3ebda10a4409ed3724b76d8b6317295843a6424fb33606e8a +a8b9cf501acf810979eab60d5085582f873e293ee5420c88546e6dbe0aa1184c
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.