diff for duplicates of <1502195795.4296.37.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 20a7fa6..afcd89a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On Mon, 2017-07-31 at 12:26 -0700, Markus Mayer wrote: > Signed-off-by: Markus Mayer <mmayer@broadcom.com> $ file v3-1-4-Documentation-devicetree-add-binding-for-Broadcom-STB- -AVS-TMON.patch +AVS-TMON.patch? unified diff output, UTF-8 Unicode text BTW, can you please rebase this patch set on top of v4.13-rc3? @@ -17,11 +17,11 @@ At least there are some conflicts in MAINTAINER file, introduced in thanks, rui > --- -> .../devicetree/bindings/thermal/brcm,avs-tmon.txt | 20 +> ?.../devicetree/bindings/thermal/brcm,avs-tmon.txt????| 20 > ++++++++++++++++++++ -> MAINTAINERS | 8 ++++++++ -> 2 files changed, 28 insertions(+) -> create mode 100644 +> ?MAINTAINERS??????????????????????????????????????????|??8 ++++++++ +> ?2 files changed, 28 insertions(+) +> ?create mode 100644 > Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt > > diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs- @@ -46,7 +46,7 @@ rui > + > +Example: > + -> + thermal@f04d1500 { +> + thermal at f04d1500 { > + compatible = "brcm,avs-tmon-bcm7445", "brcm,avs- > tmon"; > + reg = <0xf04d1500 0x28>; @@ -59,19 +59,19 @@ rui > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2928,6 +2928,14 @@ S: Maintained -> F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs- +> ?F: Documentation/devicetree/bindings/cpufreq/brcm,stb-avs- > cpu-freq.txt -> F: drivers/cpufreq/brcmstb* -> +> ?F: drivers/cpufreq/brcmstb* +> ? > +BROADCOM STB AVS TMON DRIVER > +M: Markus Mayer <mmayer@broadcom.com> -> +M: bcm-kernel-feedback-list@broadcom.com -> +L: linux-pm@vger.kernel.org +> +M: bcm-kernel-feedback-list at broadcom.com +> +L: linux-pm at vger.kernel.org > +S: Maintained > +F: Documentation/devicetree/bindings/thermal/brcm,avs- > tmon.txt > +F: drivers/thermal/broadcom/brcmstb* > + -> BROADCOM SPECIFIC AMBA DRIVER (BCMA) -> M: Rafał Miłecki <zajec5@gmail.com> -> L: linux-wireless@vger.kernel.org +> ?BROADCOM SPECIFIC AMBA DRIVER (BCMA) +> ?M: Rafa? Mi?ecki <zajec5@gmail.com> +> ?L: linux-wireless at vger.kernel.org diff --git a/a/content_digest b/N1/content_digest index 5061dd8..e75e7c8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,28 +1,9 @@ "ref\020170731192633.58747-1-code@mmayer.net\0" "ref\020170731192633.58747-2-code@mmayer.net\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH v3 1/4] Documentation: devicetree: add binding for Broadcom STB AVS TMON\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH v3 1/4] Documentation: devicetree: add binding for Broadcom STB AVS TMON\0" "Date\0Tue, 08 Aug 2017 20:36:35 +0800\0" - "To\0Markus Mayer <code@mmayer.net>" - Eduardo Valentin <edubezval@gmail.com> - Rob Herring <robh+dt@kernel.org> - Mark Rutland <mark.rutland@arm.com> - Doug Berger <opendmb@gmail.com> - Brian Norris <computersforpeace@gmail.com> - Gregory Fong <gregory.0xf0@gmail.com> - Florian Fainelli <f.fainelli@gmail.com> - " Rafa\305\202 Mi\305\202ecki <rafal@milecki.pl>" - Russell King <linux@armlinux.org.uk> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Arnd Bergmann <arnd@arndb.de> - " Olof Johansson <olof@lixom.net>\0" - "Cc\0Broadcom Kernel List <bcm-kernel-feedback-list@broadcom.com>" - Power Management List <linux-pm@vger.kernel.org> - Device Tree List <devicetree@vger.kernel.org> - ARM Kernel List <linux-arm-kernel@lists.infradead.org> - Linux Kernel Mailing List <linux-kernel@vger.kernel.org> - " Markus Mayer <mmayer@broadcom.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 2017-07-31 at 12:26 -0700, Markus Mayer wrote:\n" @@ -34,7 +15,7 @@ "> Signed-off-by: Markus Mayer <mmayer@broadcom.com>\n" "\n" "$ file v3-1-4-Documentation-devicetree-add-binding-for-Broadcom-STB-\n" - "AVS-TMON.patch\302\240\n" + "AVS-TMON.patch?\n" "unified diff output, UTF-8 Unicode text\n" "\n" "BTW, can you please rebase this patch set on top of v4.13-rc3?\n" @@ -44,11 +25,11 @@ "thanks,\n" "rui\n" "> ---\n" - "> \302\240.../devicetree/bindings/thermal/brcm,avs-tmon.txt\302\240\302\240\302\240\302\240| 20\n" + "> ?.../devicetree/bindings/thermal/brcm,avs-tmon.txt????| 20\n" "> ++++++++++++++++++++\n" - "> \302\240MAINTAINERS\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\2408 ++++++++\n" - "> \302\2402 files changed, 28 insertions(+)\n" - "> \302\240create mode 100644\n" + "> ?MAINTAINERS??????????????????????????????????????????|??8 ++++++++\n" + "> ?2 files changed, 28 insertions(+)\n" + "> ?create mode 100644\n" "> Documentation/devicetree/bindings/thermal/brcm,avs-tmon.txt\n" "> \n" "> diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs-\n" @@ -73,7 +54,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tthermal@f04d1500 {\n" + "> +\tthermal at f04d1500 {\n" "> +\t\tcompatible = \"brcm,avs-tmon-bcm7445\", \"brcm,avs-\n" "> tmon\";\n" "> +\t\treg = <0xf04d1500 0x28>;\n" @@ -86,21 +67,21 @@ "> --- a/MAINTAINERS\n" "> +++ b/MAINTAINERS\n" "> @@ -2928,6 +2928,14 @@ S:\tMaintained\n" - "> \302\240F:\tDocumentation/devicetree/bindings/cpufreq/brcm,stb-avs-\n" + "> ?F:\tDocumentation/devicetree/bindings/cpufreq/brcm,stb-avs-\n" "> cpu-freq.txt\n" - "> \302\240F:\tdrivers/cpufreq/brcmstb*\n" - "> \302\240\n" + "> ?F:\tdrivers/cpufreq/brcmstb*\n" + "> ?\n" "> +BROADCOM STB AVS TMON DRIVER\n" "> +M:\tMarkus Mayer <mmayer@broadcom.com>\n" - "> +M:\tbcm-kernel-feedback-list@broadcom.com\n" - "> +L:\tlinux-pm@vger.kernel.org\n" + "> +M:\tbcm-kernel-feedback-list at broadcom.com\n" + "> +L:\tlinux-pm at vger.kernel.org\n" "> +S:\tMaintained\n" "> +F:\tDocumentation/devicetree/bindings/thermal/brcm,avs-\n" "> tmon.txt\n" "> +F:\tdrivers/thermal/broadcom/brcmstb*\n" "> +\n" - "> \302\240BROADCOM SPECIFIC AMBA DRIVER (BCMA)\n" - "> \302\240M:\tRafa\305\202 Mi\305\202ecki <zajec5@gmail.com>\n" - "> \302\240L:\tlinux-wireless@vger.kernel.org" + "> ?BROADCOM SPECIFIC AMBA DRIVER (BCMA)\n" + "> ?M:\tRafa? Mi?ecki <zajec5@gmail.com>\n" + "> ?L:\tlinux-wireless at vger.kernel.org" -2e6bdac88cd415288684dfb175a532c8cd1e0e5dd78dcd8781b8de4c3adcb091 +8cd4b7f4980dd287ff8efab41e675a10d7d50a72d309e8757370358963c3a8ab
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.