diff for duplicates of <20181005165848.3474-2-robh@kernel.org>
diff --git a/a/content_digest b/N1/content_digest
index 8cffdaa..2b48822 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
"From\0Rob Herring <robh\@kernel.org>\0"
]
[
- "Subject\0[PATCH 01/36] dt-bindings: arm: alpine: Move CPU control related binding to cpu-enable-method/al,alpine-smp\0"
+ "Subject\0[PATCH 01/36] dt-bindings: arm: alpine: Move CPU control related binding to cpu-enable-method/al, alpine-smp\0"
]
[
"Date\0Fri, 5 Oct 2018 11:58:13 -0500\0"
@@ -17,21 +17,21 @@
" linuxppc-dev\@lists.ozlabs.org\0"
]
[
- "Cc\0Grant Likely <glikely\@secretlab.ca>",
+ "Cc\0Mark Rutland <mark.rutland\@arm.com>",
+ " Tom Rini <trini\@konsulko.com>",
" Kumar Gala <kumar.gala\@linaro.org>",
- " Frank Rowand <frowand.list\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Linus Walleij <linus.walleij\@linaro.org>",
- " Olof Johansson <olof\@lixom.net>",
+ " Grant Likely <glikely\@secretlab.ca>",
" Arnd Bergmann <arnd\@arndb.de>",
- " Mark Brown <broonie\@kernel.org>",
- " Tom Rini <trini\@konsulko.com>",
+ " Linus Walleij <linus.walleij\@linaro.org>",
" Pantelis Antoniou <pantelis.antoniou\@konsulko.com>",
+ " Bjorn Andersson <bjorn.andersson\@linaro.org>",
+ " Mark Brown <broonie\@kernel.org>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
+ " Olof Johansson <olof\@lixom.net>",
+ " Frank Rowand <frowand.list\@gmail.com>",
+ " Antoine Tenart <antoine.tenart\@free-electrons.com>",
" Jonathan Cameron <jic23\@kernel.org>",
- " Bjorn Andersson <bjorn.andersson\@linaro.org>",
- " Tsahee Zidenberg <tsahee\@annapurnalabs.com>",
- " Antoine Tenart <antoine.tenart\@free-electrons.com>\0"
+ " Tsahee Zidenberg <tsahee\@annapurnalabs.com>\0"
]
[
"\0000:1\0"
@@ -187,4 +187,4 @@
"2.17.1"
]
-1cb5434134788f2a9de60490c9ac94111bb8dd644b1e9054ae44d9742667c235
+1dab3cd95f58e05035b6e682fb6ed233e061b7bc14fd55a3f6a9079d266e11eb
diff --git a/a/1.txt b/N2/1.txt
index e552ef2..d746464 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -5,7 +5,7 @@ control to al,alpine-smp and we can also remove a cross reference.
Cc: Tsahee Zidenberg <tsahee@annapurnalabs.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: devicetree@vger.kernel.org
+Cc: devicetree at vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
.../devicetree/bindings/arm/al,alpine.txt | 72 -------------------
@@ -33,25 +33,25 @@ index f404a4f9b165..d00debe2e86f 100644
- #size-cells = <0>;
- enable-method = "al,alpine-smp";
-
-- cpu@0 {
+- cpu at 0 {
- compatible = "arm,cortex-a15";
- device_type = "cpu";
- reg = <0>;
- };
-
-- cpu@1 {
+- cpu at 1 {
- compatible = "arm,cortex-a15";
- device_type = "cpu";
- reg = <1>;
- };
-
-- cpu@2 {
+- cpu at 2 {
- compatible = "arm,cortex-a15";
- device_type = "cpu";
- reg = <2>;
- };
-
-- cpu@3 {
+- cpu at 3 {
- compatible = "arm,cortex-a15";
- device_type = "cpu";
- reg = <3>;
diff --git a/a/content_digest b/N2/content_digest
index 8cffdaa..1585382 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,36 +2,16 @@
"ref\00020181005165848.3474-1-robh\@kernel.org\0"
]
[
- "From\0Rob Herring <robh\@kernel.org>\0"
+ "From\0robh\@kernel.org (Rob Herring)\0"
]
[
- "Subject\0[PATCH 01/36] dt-bindings: arm: alpine: Move CPU control related binding to cpu-enable-method/al,alpine-smp\0"
+ "Subject\0[PATCH 01/36] dt-bindings: arm: alpine: Move CPU control related binding to cpu-enable-method/al, alpine-smp\0"
]
[
"Date\0Fri, 5 Oct 2018 11:58:13 -0500\0"
]
[
- "To\0linux-kernel\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " linuxppc-dev\@lists.ozlabs.org\0"
-]
-[
- "Cc\0Grant Likely <glikely\@secretlab.ca>",
- " Kumar Gala <kumar.gala\@linaro.org>",
- " Frank Rowand <frowand.list\@gmail.com>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Linus Walleij <linus.walleij\@linaro.org>",
- " Olof Johansson <olof\@lixom.net>",
- " Arnd Bergmann <arnd\@arndb.de>",
- " Mark Brown <broonie\@kernel.org>",
- " Tom Rini <trini\@konsulko.com>",
- " Pantelis Antoniou <pantelis.antoniou\@konsulko.com>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Jonathan Cameron <jic23\@kernel.org>",
- " Bjorn Andersson <bjorn.andersson\@linaro.org>",
- " Tsahee Zidenberg <tsahee\@annapurnalabs.com>",
- " Antoine Tenart <antoine.tenart\@free-electrons.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -47,7 +27,7 @@
"Cc: Tsahee Zidenberg <tsahee\@annapurnalabs.com>\n",
"Cc: Antoine Tenart <antoine.tenart\@free-electrons.com>\n",
"Cc: Mark Rutland <mark.rutland\@arm.com>\n",
- "Cc: devicetree\@vger.kernel.org\n",
+ "Cc: devicetree at vger.kernel.org\n",
"Signed-off-by: Rob Herring <robh\@kernel.org>\n",
"---\n",
" .../devicetree/bindings/arm/al,alpine.txt | 72 -------------------\n",
@@ -75,25 +55,25 @@
"-\t#size-cells = <0>;\n",
"-\tenable-method = \"al,alpine-smp\";\n",
"-\n",
- "-\tcpu\@0 {\n",
+ "-\tcpu at 0 {\n",
"-\t\tcompatible = \"arm,cortex-a15\";\n",
"-\t\tdevice_type = \"cpu\";\n",
"-\t\treg = <0>;\n",
"-\t};\n",
"-\n",
- "-\tcpu\@1 {\n",
+ "-\tcpu at 1 {\n",
"-\t\tcompatible = \"arm,cortex-a15\";\n",
"-\t\tdevice_type = \"cpu\";\n",
"-\t\treg = <1>;\n",
"-\t};\n",
"-\n",
- "-\tcpu\@2 {\n",
+ "-\tcpu at 2 {\n",
"-\t\tcompatible = \"arm,cortex-a15\";\n",
"-\t\tdevice_type = \"cpu\";\n",
"-\t\treg = <2>;\n",
"-\t};\n",
"-\n",
- "-\tcpu\@3 {\n",
+ "-\tcpu at 3 {\n",
"-\t\tcompatible = \"arm,cortex-a15\";\n",
"-\t\tdevice_type = \"cpu\";\n",
"-\t\treg = <3>;\n",
@@ -187,4 +167,4 @@
"2.17.1"
]
-1cb5434134788f2a9de60490c9ac94111bb8dd644b1e9054ae44d9742667c235
+03f98a850ba75be688eda1abe6317bb40ef0fdeb02673fdc9286811148963743
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.