diff for duplicates of <20151130205941.12e22f04@xhacker> diff --git a/a/1.txt b/N1/1.txt index 277c6be..58ddae4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ Sebastian Hesselbarth wrote: > >>>>> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > >>>>> --- > [...] -> >>>>> + wdt0: watchdog at 1000 { +> >>>>> + wdt0: watchdog@1000 { > >>>>> + compatible = "snps,dw-wdt"; > >>>>> + reg = <0x1000 0x100>; > >>>>> + clocks = <&refclk>; diff --git a/a/content_digest b/N1/content_digest index f11c870..f805f63 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,10 +5,21 @@ "ref\0564F8062.8070609@gmail.com\0" "ref\020151123125953.5c30a0ef@xhacker\0" "ref\0565991B0.5030909@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\0Mon, 30 Nov 2015 20:59:41 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Cc\0robh+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 Sat, 28 Nov 2015 12:36:16 +0100\n" @@ -28,7 +39,7 @@ "> >>>>> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n" "> >>>>> --- \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" @@ -93,4 +104,4 @@ "Thanks a lot,\n" Jisheng -7d258e706de9590c8bb64a06a068a2ebd5d6bdc0adfd35296f03cb59b02c0d11 +7b401c759fb58629e128b570f280010359713524b2ce09d76ec731bb266cccca
diff --git a/a/1.txt b/N2/1.txt index 277c6be..58ddae4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,7 @@ Sebastian Hesselbarth wrote: > >>>>> Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > >>>>> --- > [...] -> >>>>> + 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 f11c870..903b1c7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,10 +5,21 @@ "ref\0564F8062.8070609@gmail.com\0" "ref\020151123125953.5c30a0ef@xhacker\0" "ref\0565991B0.5030909@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\0Mon, 30 Nov 2015 20:59:41 +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 Sat, 28 Nov 2015 12:36:16 +0100\n" @@ -28,7 +39,7 @@ "> >>>>> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>\n" "> >>>>> --- \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" @@ -93,4 +104,4 @@ "Thanks a lot,\n" Jisheng -7d258e706de9590c8bb64a06a068a2ebd5d6bdc0adfd35296f03cb59b02c0d11 +33688c7f58798038f625c27c571baec5450074308c8f403f26499c2a4026a40d
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.