diff for duplicates of <20151120113414.1aa1e48e@xhacker> diff --git a/a/1.txt b/N1/1.txt index 1bc2eb2..aa981ba 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ Sebastian Hesselbarth wrote: > > snps,dw-wdt driver sit in the sysmgr domain. This patch adds the > > corresponding device tree nodes. > > -> > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> +> > Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> > > --- > > arch/arm/boot/dts/berlin2q.dtsi | 24 ++++++++++++++++++++++++ > > 1 file changed, 24 insertions(+) @@ -19,7 +19,7 @@ Sebastian Hesselbarth wrote: > > ranges = <0 0xfc0000 0x10000>; > > interrupt-parent = <&sic>; > > -> > + wdt0: watchdog at 1000 { +> > + wdt0: watchdog@1000 { > > + compatible = "snps,dw-wdt"; > > + reg = <0x1000 0x100>; > > + clocks = <&refclk>; @@ -57,4 +57,9 @@ Jisheng > with status property removed. > > Sebastian -> +> + +-- +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 5c86172..92b2e87 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,22 @@ "ref\01447672194-483-1-git-send-email-jszhang@marvell.com\0" "ref\01447672194-483-2-git-send-email-jszhang@marvell.com\0" "ref\0564E3549.2050700@gmail.com\0" - "From\0jszhang@marvell.com (Jisheng Zhang)\0" - "Subject\0[PATCH RESEND 1/8] arm: dts: berlin2q: add watchdog nodes\0" + "ref\0564E3549.2050700-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\0" + "Subject\0Re: [PATCH RESEND 1/8] arm: dts: berlin2q: add watchdog nodes\0" "Date\0Fri, 20 Nov 2015 11:34:14 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + pawel.moll-5wv7dgnIgG8@public.gmane.org + mark.rutland-5wv7dgnIgG8@public.gmane.org + ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org + galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org + linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org + catalin.marinas-5wv7dgnIgG8@public.gmane.org + will.deacon-5wv7dgnIgG8@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Thu, 19 Nov 2015 21:47:05 +0100\n" @@ -15,7 +27,7 @@ "> > snps,dw-wdt driver sit in the sysmgr domain. This patch adds the\n" "> > corresponding device tree nodes.\n" "> > \n" - "> > Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n" + "> > Signed-off-by: Jisheng Zhang <jszhang-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>\n" "> > ---\n" "> > arch/arm/boot/dts/berlin2q.dtsi | 24 ++++++++++++++++++++++++\n" "> > 1 file changed, 24 insertions(+)\n" @@ -28,7 +40,7 @@ "> > \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> > \t\t\tinterrupt-parent = <&sic>;\n" "> > \n" - "> > +\t\t\twdt0: watchdog at 1000 {\n" + "> > +\t\t\twdt0: watchdog@1000 {\n" "> > +\t\t\t\tcompatible = \"snps,dw-wdt\";\n" "> > +\t\t\t\treg = <0x1000 0x100>;\n" "> > +\t\t\t\tclocks = <&refclk>;\n" @@ -66,6 +78,11 @@ "> with status property removed.\n" "> \n" "> Sebastian\n" - > + "> \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 -e638ed5693ca6e405b36a91f330f91b770205b961e30325754856ae7959b5b03 +f1f2c2329d7b8a83f77dfe0f6e6f8ce478c8794e5068d858f4951fe4344c1f7b
diff --git a/a/1.txt b/N2/1.txt index 1bc2eb2..d222bb9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,7 @@ Sebastian Hesselbarth wrote: > > ranges = <0 0xfc0000 0x10000>; > > interrupt-parent = <&sic>; > > -> > + wdt0: watchdog at 1000 { +> > + wdt0: watchdog@1000 { > > + compatible = "snps,dw-wdt"; > > + reg = <0x1000 0x100>; > > + clocks = <&refclk>; diff --git a/a/content_digest b/N2/content_digest index 5c86172..c7276c0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,21 @@ "ref\01447672194-483-1-git-send-email-jszhang@marvell.com\0" "ref\01447672194-483-2-git-send-email-jszhang@marvell.com\0" "ref\0564E3549.2050700@gmail.com\0" - "From\0jszhang@marvell.com (Jisheng Zhang)\0" - "Subject\0[PATCH RESEND 1/8] arm: dts: berlin2q: add watchdog nodes\0" + "From\0Jisheng Zhang <jszhang@marvell.com>\0" + "Subject\0Re: [PATCH RESEND 1/8] arm: dts: berlin2q: add watchdog nodes\0" "Date\0Fri, 20 Nov 2015 11:34:14 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0<robh+dt@kernel.org>" + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <linux@arm.linux.org.uk> + <catalin.marinas@arm.com> + <will.deacon@arm.com> + <linux-arm-kernel@lists.infradead.org> + <devicetree@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Thu, 19 Nov 2015 21:47:05 +0100\n" @@ -28,7 +39,7 @@ "> > \t\t\tranges = <0 0xfc0000 0x10000>;\n" "> > \t\t\tinterrupt-parent = <&sic>;\n" "> > \n" - "> > +\t\t\twdt0: watchdog at 1000 {\n" + "> > +\t\t\twdt0: watchdog@1000 {\n" "> > +\t\t\t\tcompatible = \"snps,dw-wdt\";\n" "> > +\t\t\t\treg = <0x1000 0x100>;\n" "> > +\t\t\t\tclocks = <&refclk>;\n" @@ -68,4 +79,4 @@ "> Sebastian\n" > -e638ed5693ca6e405b36a91f330f91b770205b961e30325754856ae7959b5b03 +f88d2a7e4f1d11cad9fb4e61864a50c7e9f187f6dbd9ec4aa985d5376cc88dd0
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.