diff for duplicates of <54E5CD2E.9070608@collabora.co.uk> diff --git a/a/1.txt b/N1/1.txt index 766b599..baff82d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,25 +1,21 @@ 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/8pPYcu2f3hruQ@public.gmane.org> +Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Best regards, Javier --- -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/N1/content_digest index 21c097d..e044e5d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,50 +1,30 @@ "ref\01424275812-6797-1-git-send-email-afaerber@suse.de\0" - "ref\01424275812-6797-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org\0" - "From\0Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>\0" - "Subject\0Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" + "From\0javier.martinez@collabora.co.uk (Javier Martinez Canillas)\0" + "Subject\0[PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" "Date\0Thu, 19 Feb 2015 12:46:54 +0100\0" - "To\0Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>" - " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0linux-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> - Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - " open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "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/8pPYcu2f3hruQ@public.gmane.org>\n" + "Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>\n" "\n" "Best regards,\n" - "Javier\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 + Javier -48afaca9d6429a9d74c52e5c050d87e81f3ff808cd0933c593469c55e8ee9d50 +1a63c8fae1f01d6ac307535f1ff78086b06a7dc2cc46a516bbb10d904486ca2a
diff --git a/a/1.txt b/N2/1.txt index 766b599..6ae06e0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -7,19 +7,15 @@ On 02/18/2015 05:10 PM, Andreas Färber wrote: > 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/8pPYcu2f3hruQ@public.gmane.org> +Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Best regards, Javier --- -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 21c097d..e4cfa20 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,23 @@ "ref\01424275812-6797-1-git-send-email-afaerber@suse.de\0" - "ref\01424275812-6797-1-git-send-email-afaerber-l3A5Bk7waGM@public.gmane.org\0" - "From\0Javier Martinez Canillas <javier.martinez-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>\0" + "From\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" "Subject\0Re: [PATCH] ARM: dts: Update exynos5250-spring with mmc node changes\0" "Date\0Thu, 19 Feb 2015 12:46:54 +0100\0" - "To\0Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>" - " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0linux-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> - Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - " open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0Andreas F\303\244rber <afaerber@suse.de>" + " linux-samsung-soc@vger.kernel.org\0" + "Cc\0linux-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> + Kukjin Kim <kgene@kernel.org> + " open list <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "Hello Andreas,\n" @@ -30,21 +29,17 @@ "> 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/8pPYcu2f3hruQ@public.gmane.org>\n" + "Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>\n" "\n" "Best regards,\n" - "Javier\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 + Javier -48afaca9d6429a9d74c52e5c050d87e81f3ff808cd0933c593469c55e8ee9d50 +c9509f60c73d916a5d15fa11cdb4f99b5420b4d252a79cc66fc732d2bf96a4f3
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.