diff for duplicates of <54EBA4A2.1050607@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 4fdd552..3eba746 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,7 +71,7 @@ index 4726924d034e..78b92bec4c3a 100644 @@ -17,8 +13,9 @@ Optional properties : Example: - watchdog@208a038 { + watchdog at 208a038 { - compatible = "qcom,kpss-wdt-ipq8064"; - reg = <0x0208a038 0x40>; + compatible = "qcom,kpss-wdt"; diff --git a/a/content_digest b/N1/content_digest index 682cd2d..caaee11 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,9 @@ "ref\01424485176-8348-1-git-send-email-mathieu@codeaurora.org\0" "ref\05879121.Ud0l5ICsCF@wuerfel\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" - "Subject\0Re: [PATCH 0/3] arm: msm: Use timer DT node for qcom watchdog config\0" + "From\0sboyd@codeaurora.org (Stephen Boyd)\0" + "Subject\0[PATCH 0/3] arm: msm: Use timer DT node for qcom watchdog config\0" "Date\0Mon, 23 Feb 2015 14:07:30 -0800\0" - "To\0Arnd Bergmann <arnd@arndb.de>" - " Mathieu Olivari <mathieu@codeaurora.org>\0" - "Cc\0mark.rutland@arm.com" - devicetree@vger.kernel.org - linux@arm.linux.org.uk - linux-watchdog@vger.kernel.org - pawel.moll@arm.com - ijc+devicetree@hellion.org.uk - corbet@lwn.net - linux-kernel@vger.kernel.org - standby24x7@gmail.com - wim@iguana.be - robh+dt@kernel.org - galak@codeaurora.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 02/23/15 13:35, Arnd Bergmann wrote:\n" @@ -93,7 +79,7 @@ "@@ -17,8 +13,9 @@ Optional properties :\n" " \n" " Example:\n" - " \twatchdog@208a038 {\n" + " \twatchdog at 208a038 {\n" "-\t\tcompatible = \"qcom,kpss-wdt-ipq8064\";\n" "-\t\treg = <0x0208a038 0x40>;\n" "+\t\tcompatible = \"qcom,kpss-wdt\";\n" @@ -107,4 +93,4 @@ "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" a Linux Foundation Collaborative Project -90d5bd347b424820315133099faf640dc043ee31e49af01131bfc5e67b64b3c8 +de0ace82c00bfccd9fd86cfbcadc44cefaf637a44fd734bd0e30f7a95cc50314
diff --git a/a/1.txt b/N2/1.txt index 4fdd552..9ab4b2e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,7 +34,7 @@ offsets are different, but otherwise the registers are the same. ---8<----- -From: Stephen Boyd <sboyd@codeaurora.org> +From: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> Subject: [PATCH] Documentation: qcom-wdt: Update binding for individual block On msm8974 and beyond the KPSS watchdog is split out of the timer @@ -42,7 +42,7 @@ block and made to be a single instance instead of per-cpu. Let's update the binding to reflect this and replace the binding that is handled by the qcom,kpss-timer binding. -Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +Signed-off-by: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> --- Documentation/devicetree/bindings/watchdog/qcom-wdt.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) @@ -84,3 +84,8 @@ index 4726924d034e..78b92bec4c3a 100644 -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project + +-- +To unsubscribe from this list: send the line "unsubscribe linux-watchdog" 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 682cd2d..c5615b4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,23 @@ "ref\01424485176-8348-1-git-send-email-mathieu@codeaurora.org\0" "ref\05879121.Ud0l5ICsCF@wuerfel\0" - "From\0Stephen Boyd <sboyd@codeaurora.org>\0" + "From\0Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" "Subject\0Re: [PATCH 0/3] arm: msm: Use timer DT node for qcom watchdog config\0" "Date\0Mon, 23 Feb 2015 14:07:30 -0800\0" - "To\0Arnd Bergmann <arnd@arndb.de>" - " Mathieu Olivari <mathieu@codeaurora.org>\0" - "Cc\0mark.rutland@arm.com" - devicetree@vger.kernel.org - linux@arm.linux.org.uk - linux-watchdog@vger.kernel.org - pawel.moll@arm.com - ijc+devicetree@hellion.org.uk - corbet@lwn.net - linux-kernel@vger.kernel.org - standby24x7@gmail.com - wim@iguana.be - robh+dt@kernel.org - galak@codeaurora.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>" + " Mathieu Olivari <mathieu-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "Cc\0mark.rutland-5wv7dgnIgG8@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + linux-watchdog-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + pawel.moll-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + corbet-T1hC0tSOHrs@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + standby24x7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org + wim-IQzOog9fTRqzQB+pC5nmwQ@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 02/23/15 13:35, Arnd Bergmann wrote:\n" @@ -56,7 +56,7 @@ "\n" "---8<-----\n" "\n" - "From: Stephen Boyd <sboyd@codeaurora.org>\n" + "From: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n" "Subject: [PATCH] Documentation: qcom-wdt: Update binding for individual block\n" "\n" "On msm8974 and beyond the KPSS watchdog is split out of the timer\n" @@ -64,7 +64,7 @@ "update the binding to reflect this and replace the binding that\n" "is handled by the qcom,kpss-timer binding.\n" "\n" - "Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>\n" + "Signed-off-by: Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n" "---\n" " Documentation/devicetree/bindings/watchdog/qcom-wdt.txt | 13 +++++--------\n" " 1 file changed, 5 insertions(+), 8 deletions(-)\n" @@ -105,6 +105,11 @@ "\n" "-- \n" "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" - a Linux Foundation Collaborative Project + "a Linux Foundation Collaborative Project\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-watchdog\" 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 -90d5bd347b424820315133099faf640dc043ee31e49af01131bfc5e67b64b3c8 +7f4ac3e92468423d792089baf86f1ea5c4ce08aefcf0326243f813c64e584c34
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.