diff for duplicates of <1994467.CVFvpbaMyF@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 2cf4c9d..2a9a717 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +++ renesas/arch/arm/boot/dts/r8a7794.dtsi @@ -1251,7 +1251,7 @@ - mstp5_clks: mstp5_clks@e6150144 { + mstp5_clks: mstp5_clks at e6150144 { compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>; - clocks = <&hp_clk>, <&extal_clk>, <&p_clk>; diff --git a/a/content_digest b/N1/content_digest index a869357..f7e7246 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,8 @@ "ref\01618499.8bcj8adpVO@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: dts: r8a7794: fix PWM clock parent\0" "Date\0Sun, 04 Sep 2016 22:55:37 +0300\0" - "To\0horms@verge.net.au" - linux-renesas-soc@vger.kernel.org - robh+dt@kernel.org - mark.rutland@arm.com - " devicetree@vger.kernel.org\0" - "Cc\0magnus.damm@gmail.com" - linux@arm.linux.org.uk - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "When removing the non-existing thermal clock I forgot to remove its\n" @@ -31,7 +24,7 @@ "--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" "@@ -1251,7 +1251,7 @@\n" - " \t\tmstp5_clks: mstp5_clks@e6150144 {\n" + " \t\tmstp5_clks: mstp5_clks at e6150144 {\n" " \t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" " \t\t\treg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;\n" "-\t\t\tclocks = <&hp_clk>, <&extal_clk>, <&p_clk>;\n" @@ -40,4 +33,4 @@ " \t\t\tclock-indices = <R8A7794_CLK_AUDIO_DMAC0\n" " \t\t\t\t\t R8A7794_CLK_PWM>;" -004ec5bf41f460291f1d50015b1641aac1aa0f006ff3558a4b288eba45cbc77c +2842e4d94b744e134eb2d7c27fff59730ed35acb5d44667f9316a47a40e58cbf
diff --git a/a/1.txt b/N2/1.txt index 2cf4c9d..38d603b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ parent from the node's "clocks" property -- this led to a wrong PWM clock's parent clock. Fixes: 2a29f9d6fea8 ("ARM: dts: r8a7794: add MSTP5 clocks") -Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> +Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org> --- The patch is against the 'renesas-devel-20160902-v4.8-rc4' branch of Simon @@ -25,3 +25,8 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi #clock-cells = <1>; clock-indices = <R8A7794_CLK_AUDIO_DMAC0 R8A7794_CLK_PWM>; + +-- +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 a869357..eb4268f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,16 @@ "ref\01618499.8bcj8adpVO@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "ref\01618499.8bcj8adpVO-gHKXc3Y1Z8zGSmamagVegGFoWSdPRAKMAL8bYrjMMd8@public.gmane.org\0" + "From\0Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>\0" "Subject\0[PATCH] ARM: dts: r8a7794: fix PWM clock parent\0" "Date\0Sun, 04 Sep 2016 22:55:37 +0300\0" - "To\0horms@verge.net.au" - linux-renesas-soc@vger.kernel.org - robh+dt@kernel.org - mark.rutland@arm.com - " devicetree@vger.kernel.org\0" - "Cc\0magnus.damm@gmail.com" - linux@arm.linux.org.uk - " linux-arm-kernel@lists.infradead.org\0" + "To\0horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org" + linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Cc\0magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "When removing the non-existing thermal clock I forgot to remove its\n" @@ -17,7 +18,7 @@ "clock's parent clock.\n" "\n" "Fixes: 2a29f9d6fea8 (\"ARM: dts: r8a7794: add MSTP5 clocks\")\n" - "Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\n" + "Signed-off-by: Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>\n" "\n" "---\n" "The patch is against the 'renesas-devel-20160902-v4.8-rc4' branch of Simon\n" @@ -38,6 +39,11 @@ "+\t\t\tclocks = <&hp_clk>, <&p_clk>;\n" " \t\t\t#clock-cells = <1>;\n" " \t\t\tclock-indices = <R8A7794_CLK_AUDIO_DMAC0\n" - " \t\t\t\t\t R8A7794_CLK_PWM>;" + " \t\t\t\t\t R8A7794_CLK_PWM>;\n" + "\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 -004ec5bf41f460291f1d50015b1641aac1aa0f006ff3558a4b288eba45cbc77c +54c129f164fb136d70dd1b2c0e96aa8de5711439db7353e3ddca8e220e0ff0d2
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.