diff for duplicates of <31c765c53e85e41bfc001d110d69e46c9967f4e7.1516961656.git.ryder.lee@mediatek.com>
diff --git a/a/1.txt b/N1/1.txt
index 696cddc..fc32454 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -35,7 +35,7 @@ thus the subsequent flow couldn't correctly resolve them.
Fix this by adding a check to fallback to standard device tree parsing.
-Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
+Signed-off-by: Ryder Lee <ryder.lee-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
Please refer to the previous discussion thread: https://patchwork.ozlabs.org/patch/829108/
---
@@ -68,4 +68,9 @@ index 3a05568..e445866 100644
if (rc)
goto err;
--
-1.9.1
\ No newline at end of file
+1.9.1
+
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index e7f90a4..a80c469 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Ryder Lee <ryder.lee\@mediatek.com>\0"
+ "From\0Ryder Lee <ryder.lee-NuS5LvNUpcJWk0Htik3J/w\@public.gmane.org>\0"
]
[
"Subject\0[PATCH 1/2] of_pci_irq: add a check to fallback to standard device tree parsing\0"
@@ -8,20 +8,20 @@
"Date\0Wed, 31 Jan 2018 15:41:49 +0800\0"
]
[
- "To\0Arnd Bergmann <arnd\@arndb.de>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Bjorn Helgaas <bhelgaas\@google.com>\0"
+ "To\0Arnd Bergmann <arnd-r2nGTMty4D4\@public.gmane.org>",
+ " Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A\@public.gmane.org>",
+ " Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA\@public.gmane.org>\0"
]
[
- "Cc\0Frank Rowand <frowand.list\@gmail.com>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>",
- " <linux-pci\@vger.kernel.org>",
- " <devicetree\@vger.kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <linux-mediatek\@lists.infradead.org>",
- " Ryder Lee <ryder.lee\@mediatek.com>\0"
+ "Cc\0Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
+ " Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r\@public.gmane.org>",
+ " Lorenzo Pieralisi <lorenzo.pieralisi-5wv7dgnIgG8\@public.gmane.org>",
+ " linux-pci-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " devicetree-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
+ " Ryder Lee <ryder.lee-NuS5LvNUpcJWk0Htik3J/w\@public.gmane.org>\0"
]
[
"\0000:1\0"
@@ -67,7 +67,7 @@
"\n",
"Fix this by adding a check to fallback to standard device tree parsing.\n",
"\n",
- "Signed-off-by: Ryder Lee <ryder.lee\@mediatek.com>\n",
+ "Signed-off-by: Ryder Lee <ryder.lee-NuS5LvNUpcJWk0Htik3J/w\@public.gmane.org>\n",
"---\n",
"Please refer to the previous discussion thread: https://patchwork.ozlabs.org/patch/829108/\n",
"---\n",
@@ -100,7 +100,12 @@
" \tif (rc)\n",
" \t\tgoto err;\n",
"-- \n",
- "1.9.1"
+ "1.9.1\n",
+ "\n",
+ "--\n",
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n",
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org\n",
+ "More majordomo info at http://vger.kernel.org/majordomo-info.html"
]
-a1778690a489418803b1585f64b63ffad720684d26dfcdb3f23dc90b247d7fca
+a8019a554afcd553258a9deeb1322b10f72539901cf0a7b4cff060f54ca17c5c
diff --git a/a/1.txt b/N2/1.txt
index 696cddc..462f208 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -9,12 +9,12 @@ like this:
interrupt-map = <0x0000 0 0 {INTx} &{interrupt parent} ...>
0x0800 0 0 {INTx} &{interrupt parent} ...>;
- pcie@0,0 {
+ pcie at 0,0 {
reg = <0x0000 0 0 0 0>;
...
};
- pcie@1,0 {
+ pcie at 1,0 {
reg = <0x0800 0 0 0 0>;
...
};
diff --git a/a/content_digest b/N2/content_digest
index e7f90a4..5310b7a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Ryder Lee <ryder.lee\@mediatek.com>\0"
+ "From\0ryder.lee\@mediatek.com (Ryder Lee)\0"
]
[
"Subject\0[PATCH 1/2] of_pci_irq: add a check to fallback to standard device tree parsing\0"
@@ -8,20 +8,7 @@
"Date\0Wed, 31 Jan 2018 15:41:49 +0800\0"
]
[
- "To\0Arnd Bergmann <arnd\@arndb.de>",
- " Rob Herring <robh+dt\@kernel.org>",
- " Bjorn Helgaas <bhelgaas\@google.com>\0"
-]
-[
- "Cc\0Frank Rowand <frowand.list\@gmail.com>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>",
- " <linux-pci\@vger.kernel.org>",
- " <devicetree\@vger.kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <linux-mediatek\@lists.infradead.org>",
- " Ryder Lee <ryder.lee\@mediatek.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -41,12 +28,12 @@
"\t\tinterrupt-map = <0x0000 0 0 {INTx} &{interrupt parent} ...>\n",
"\t\t\t\t 0x0800 0 0 {INTx} &{interrupt parent} ...>;\n",
"\n",
- "\t\tpcie\@0,0 {\n",
+ "\t\tpcie at 0,0 {\n",
"\t\t\treg = <0x0000 0 0 0 0>;\n",
"\t\t\t...\n",
"\t\t};\n",
"\n",
- "\t\tpcie\@1,0 {\n",
+ "\t\tpcie at 1,0 {\n",
"\t\t\treg = <0x0800 0 0 0 0>;\n",
"\t\t\t...\n",
"\t\t};\n",
@@ -103,4 +90,4 @@
"1.9.1"
]
-a1778690a489418803b1585f64b63ffad720684d26dfcdb3f23dc90b247d7fca
+d7ad2081b38c945339a0f7effc758a4c835d250bafefc845a1b8e09701536031
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.