diff for duplicates of <20180421140342.25082-1-miquel.raynal@bootlin.com>
diff --git a/a/1.txt b/N1/1.txt
index d58d430..3b64c33 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ handling.
[1] plat/marvell/a3700/common/include/platform_def.h
Signed-off-by: Victor Gu <xigu@marvell.com>
-[miquel.raynal@bootlin.com: reword of commit message]
+[miquel.raynal at bootlin.com: reword of commit message]
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++++
@@ -30,7 +30,7 @@ index 97207a61bc79..429ce91bfc39 100644
+ #size-cells = <2>;
+ ranges;
+
-+ psci-area@4000000 {
++ psci-area at 4000000 {
+ reg = <0 0x4000000 0 0x200000>;
+ no-map;
+ };
diff --git a/a/content_digest b/N1/content_digest
index 0411c04..29f3ed2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Miquel Raynal <miquel.raynal\@bootlin.com>\0"
+ "From\0miquel.raynal\@bootlin.com (Miquel Raynal)\0"
]
[
"Subject\0[PATCH] arm64: dts: marvell: armada-37xx: reserve memory for ATF\0"
@@ -8,24 +8,7 @@
"Date\0Sat, 21 Apr 2018 16:03:42 +0200\0"
]
[
- "To\0Gregory Clement <gregory.clement\@bootlin.com>",
- " Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>\0"
-]
-[
- "Cc\0Mark Rutland <mark.rutland\@arm.com>",
- " devicetree\@vger.kernel.org",
- " Antoine Tenart <antoine.tenart\@bootlin.com>",
- " Catalin Marinas <catalin.marinas\@arm.com>",
- " Will Deacon <will.deacon\@arm.com>",
- " Maxime Chevallier <maxime.chevallier\@bootlin.com>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Thomas Petazzoni <thomas.petazzoni\@bootlin.com>",
- " Miquel Raynal <miquel.raynal\@bootlin.com>",
- " Victor Gu <xigu\@marvell.com>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -47,7 +30,7 @@
"[1] plat/marvell/a3700/common/include/platform_def.h\n",
"\n",
"Signed-off-by: Victor Gu <xigu\@marvell.com>\n",
- "[miquel.raynal\@bootlin.com: reword of commit message]\n",
+ "[miquel.raynal at bootlin.com: reword of commit message]\n",
"Signed-off-by: Miquel Raynal <miquel.raynal\@bootlin.com>\n",
"---\n",
" arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +++++++++++\n",
@@ -66,7 +49,7 @@
"+\t\t#size-cells = <2>;\n",
"+\t\tranges;\n",
"+\n",
- "+\t\tpsci-area\@4000000 {\n",
+ "+\t\tpsci-area at 4000000 {\n",
"+\t\t\treg = <0 0x4000000 0 0x200000>;\n",
"+\t\t\tno-map;\n",
"+\t\t};\n",
@@ -79,4 +62,4 @@
"2.14.1"
]
-412fc04fdfab72588087c2451f734b170c8adccfdb6c725fb37748426fb00aed
+460a7e6cdeb1be14a3bdd781a1801b7514534dbf4bfd9acd77ec7a103b86f804
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.