diff for duplicates of <f02cef05e7348975ba5a01443f90ce4147e52edd.1490886907.git-series.gregory.clement@free-electrons.com>
diff --git a/a/content_digest b/N1/content_digest
index dee6d8f..3c4bc81 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -37,10 +37,7 @@
" Victor Gu <xigu\@marvell.com>",
" Wei(SOCP) Liu <liuw\@marvell.com>",
" Wilson Ding <dingwei\@marvell.com>",
- " Yehuda Yitschak <yehuday\@marvell.com>",
- " Marcin Wojtas <mw\@semihalf.com>",
- " Hanna Hawa <hannah\@marvell.com>",
- " Kostya Porotchkin <kostap\@marvell.com>\0"
+ " Yehuda\0"
]
[
"\0000:1\0"
@@ -104,4 +101,4 @@
"git-series 0.9.1"
]
-2d14a23d9f86afa76122a78ea45cc6b3fee5fa6344a412a2bfbe4122b3d2ef6b
+e191dea0f862fd37dd0a3835b985d36d1a67c1341abb6811e60d8f5b4f19293b
diff --git a/a/1.txt b/N2/1.txt
index a2f360d..d3e61c8 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -35,7 +35,7 @@ index b48d668a6ab6..4c499b86fb8b 100644
};
};
-+ sdhci0: sdhci@d8000 {
++ sdhci0: sdhci at d8000 {
+ compatible = "marvell,armada-3700-sdhci",
+ "marvell,sdhci-xenon";
+ reg = <0xd8000 0x300
@@ -46,7 +46,7 @@ index b48d668a6ab6..4c499b86fb8b 100644
+ status = "disabled";
+ };
+
- sata: sata@e0000 {
+ sata: sata at e0000 {
compatible = "marvell,armada-3700-ahci";
reg = <0xe0000 0x2000>;
--
diff --git a/a/content_digest b/N2/content_digest
index dee6d8f..2b9a4c0 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.51071caa64e5df81264a91b9a81ed1e94f47d2c4.1490886907.git-series.gregory.clement\@free-electrons.com\0"
]
[
- "From\0Gregory CLEMENT <gregory.clement\@free-electrons.com>\0"
+ "From\0gregory.clement\@free-electrons.com (Gregory CLEMENT)\0"
]
[
"Subject\0[PATCH v7 11/13] arm64: dts: marvell: add eMMC support for Armada 37xx\0"
@@ -11,36 +11,7 @@
"Date\0Thu, 30 Mar 2017 17:23:03 +0200\0"
]
[
- "To\0Ulf Hansson <ulf.hansson\@linaro.org>",
- " Adrian Hunter <adrian.hunter\@intel.com>",
- " linux-mmc\@vger.kernel.org\0"
-]
-[
- "Cc\0Jason Cooper <jason\@lakedaemon.net>",
- " Andrew Lunn <andrew\@lunn.ch>",
- " Sebastian Hesselbarth <sebastian.hesselbarth\@gmail.com>",
- " Gregory CLEMENT <gregory.clement\@free-electrons.com>",
- " Thomas Petazzoni <thomas.petazzoni\@free-electrons.com>",
- " linux-arm-kernel\@lists.infradead.org",
- " Mike Turquette <mturquette\@baylibre.com>",
- " Stephen Boyd <sboyd\@codeaurora.org>",
- " linux-clk\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " devicetree\@vger.kernel.org",
- " Ziji Hu <huziji\@marvell.com>",
- " Jimmy Xu <zmxu\@marvell.com>",
- " Jisheng Zhang <jszhang\@marvell.com>",
- " Nadav Haklai <nadavh\@marvell.com>",
- " Ryan Gao <ygao\@marvell.com>",
- " Doug Jones <dougj\@marvell.com>",
- " Victor Gu <xigu\@marvell.com>",
- " Wei(SOCP) Liu <liuw\@marvell.com>",
- " Wilson Ding <dingwei\@marvell.com>",
- " Yehuda Yitschak <yehuday\@marvell.com>",
- " Marcin Wojtas <mw\@semihalf.com>",
- " Hanna Hawa <hannah\@marvell.com>",
- " Kostya Porotchkin <kostap\@marvell.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -86,7 +57,7 @@
" \t\t\t\t};\n",
" \t\t\t};\n",
" \n",
- "+\t\t\tsdhci0: sdhci\@d8000 {\n",
+ "+\t\t\tsdhci0: sdhci at d8000 {\n",
"+\t\t\t\tcompatible = \"marvell,armada-3700-sdhci\",\n",
"+\t\t\t\t\"marvell,sdhci-xenon\";\n",
"+\t\t\t\treg = <0xd8000 0x300\n",
@@ -97,11 +68,11 @@
"+\t\t\t\tstatus = \"disabled\";\n",
"+\t\t\t};\n",
"+\n",
- " \t\t\tsata: sata\@e0000 {\n",
+ " \t\t\tsata: sata at e0000 {\n",
" \t\t\t\tcompatible = \"marvell,armada-3700-ahci\";\n",
" \t\t\t\treg = <0xe0000 0x2000>;\n",
"-- \n",
"git-series 0.9.1"
]
-2d14a23d9f86afa76122a78ea45cc6b3fee5fa6344a412a2bfbe4122b3d2ef6b
+eed706be8b914b4a68df7fa1e446423c055b12aa39e51a52c7a85499083e028f
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.