diff for duplicates of <20160401190627.GO9329@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 2e5f3cd..1dd87c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -* Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org> [160401 11:50]: +* Tero Kristo <t-kristo@ti.com> [160401 11:50]: > > Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains > for some reason. It should be under clocks. @@ -10,7 +10,3 @@ omap-for-v4.6/fixes-rc1 too. Regards, Tony --- -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 ff81ed4..4a44194 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,24 +6,13 @@ "ref\020160331170017.GI9329@atomide.com\0" "ref\020160401153606.GJ9329@atomide.com\0" "ref\056FEC297.50102@ti.com\0" - "ref\056FEC297.50102-l0cyMroinI0@public.gmane.org\0" - "From\0Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" - "Subject\0Re: [PATCH v2] ARM: dts: dra7: Correct clock tree for sys_32k_ck\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v2] ARM: dts: dra7: Correct clock tree for sys_32k_ck\0" "Date\0Fri, 1 Apr 2016 12:06:27 -0700\0" - "To\0Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org>\0" - "Cc\0Keerthy <a0393675-l0cyMroinI0@public.gmane.org>" - mark.rutland-5wv7dgnIgG8@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Lokesh Vutla <lokeshvutla-l0cyMroinI0@public.gmane.org> - Keerthy <j-keerthy-l0cyMroinI0@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "* Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org> [160401 11:50]:\n" + "* Tero Kristo <t-kristo@ti.com> [160401 11:50]:\n" "> \n" "> Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains\n" "> for some reason. It should be under clocks.\n" @@ -34,10 +23,6 @@ "\n" "Regards,\n" "\n" - "Tony\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 + Tony -0a3c41d4d98702c97f54210af1cf429321c9b56ae5c0c90233af095862e59510 +4371581561071ad128f1331d068646914c426bf3a5cc76017dde63ebc69084df
diff --git a/a/1.txt b/N2/1.txt index 2e5f3cd..1dd87c4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -* Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org> [160401 11:50]: +* Tero Kristo <t-kristo@ti.com> [160401 11:50]: > > Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains > for some reason. It should be under clocks. @@ -10,7 +10,3 @@ omap-for-v4.6/fixes-rc1 too. Regards, Tony --- -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 ff81ed4..fa60273 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,24 +6,23 @@ "ref\020160331170017.GI9329@atomide.com\0" "ref\020160401153606.GJ9329@atomide.com\0" "ref\056FEC297.50102@ti.com\0" - "ref\056FEC297.50102-l0cyMroinI0@public.gmane.org\0" - "From\0Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>\0" + "From\0Tony Lindgren <tony@atomide.com>\0" "Subject\0Re: [PATCH v2] ARM: dts: dra7: Correct clock tree for sys_32k_ck\0" "Date\0Fri, 1 Apr 2016 12:06:27 -0700\0" - "To\0Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org>\0" - "Cc\0Keerthy <a0393675-l0cyMroinI0@public.gmane.org>" - mark.rutland-5wv7dgnIgG8@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Lokesh Vutla <lokeshvutla-l0cyMroinI0@public.gmane.org> - Keerthy <j-keerthy-l0cyMroinI0@public.gmane.org> - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0Tero Kristo <t-kristo@ti.com>\0" + "Cc\0Keerthy <a0393675@ti.com>" + mark.rutland@arm.com + devicetree@vger.kernel.org + Lokesh Vutla <lokeshvutla@ti.com> + Keerthy <j-keerthy@ti.com> + linux-kernel@vger.kernel.org + robh+dt@kernel.org + galak@codeaurora.org + linux-omap@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "* Tero Kristo <t-kristo-l0cyMroinI0@public.gmane.org> [160401 11:50]:\n" + "* Tero Kristo <t-kristo@ti.com> [160401 11:50]:\n" "> \n" "> Looks like a merge conflict to me, sys_32k_ck has gone under clockdomains\n" "> for some reason. It should be under clocks.\n" @@ -34,10 +33,6 @@ "\n" "Regards,\n" "\n" - "Tony\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 + Tony -0a3c41d4d98702c97f54210af1cf429321c9b56ae5c0c90233af095862e59510 +537035c896ea4e2e679066785234f8f03985ff5df02836095d505a327c537679
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.