diff for duplicates of <1427114457-16687-4-git-send-email-wangyijing@huawei.com>
diff --git a/a/content_digest b/N1/content_digest
index c9677f2..e358b68 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -30,7 +30,7 @@
" David S. Miller <davem\@davemloft.net>",
" Guan Xuetao <gxt\@mprc.pku.edu.cn>",
" <linux-alpha\@vger.kernel.org>",
- " <linux-m68k\@vger.kernel.org>",
+ " <linux-m68k\@lists.linux-m68k.org>",
" Liviu Dudau <liviu\@dudau.co.uk>",
" Arnd Bergmann <arnd\@arndb.de>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
@@ -657,4 +657,4 @@
"1.7.1"
]
-8877766453923702ddb0fdcc6a57b424a45a849bb77237578d02c1c079151c2d
+c0148a3e6ef6ec2bc162dad2ada9ecd82dc376f88826dc3be6d7ee30923496e2
diff --git a/a/content_digest b/N2/content_digest
index c9677f2..51a6c72 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001427114457-16687-1-git-send-email-wangyijing\@huawei.com\0"
]
[
- "From\0Yijing Wang <wangyijing\@huawei.com>\0"
+ "From\0wangyijing\@huawei.com (Yijing Wang)\0"
]
[
"Subject\0[PATCH v7 03/31] PCI: Save domain in pci_host_bridge\0"
@@ -11,30 +11,7 @@
"Date\0Mon, 23 Mar 2015 20:40:29 +0800\0"
]
[
- "To\0Bjorn Helgaas <bhelgaas\@google.com>\0"
-]
-[
- "Cc\0Jiang Liu <jiang.liu\@linux.intel.com>",
- " <linux-pci\@vger.kernel.org>",
- " Yinghai Lu <yinghai\@kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " Marc Zyngier <marc.zyngier\@arm.com>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " Russell King <linux\@arm.linux.org.uk>",
- " <x86\@kernel.org>",
- " Thomas Gleixner <tglx\@linutronix.de>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
- " Rusty Russell <rusty\@rustcorp.com.au>",
- " Tony Luck <tony.luck\@intel.com>",
- " <linux-ia64\@vger.kernel.org>",
- " David S. Miller <davem\@davemloft.net>",
- " Guan Xuetao <gxt\@mprc.pku.edu.cn>",
- " <linux-alpha\@vger.kernel.org>",
- " <linux-m68k\@vger.kernel.org>",
- " Liviu Dudau <liviu\@dudau.co.uk>",
- " Arnd Bergmann <arnd\@arndb.de>",
- " Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Yijing Wang <wangyijing\@huawei.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -657,4 +634,4 @@
"1.7.1"
]
-8877766453923702ddb0fdcc6a57b424a45a849bb77237578d02c1c079151c2d
+630d5b0115ca9a9ba9bb67c4734941c15fd185954680d203c144fb6fa86e0e25
diff --git a/a/1.txt b/N3/1.txt
index 6c630b8..7785981 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -136,12 +136,12 @@ index b02f394..83898cc 100644
@@ -558,11 +558,11 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)
struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys)
{
- if (nr == 0)
+ if (nr = 0)
- return pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+ return pci_scan_root_bus(NULL, -1, sys->busnr, &pcie_ops, sys,
&sys->resources);
- if (nr == 1 && !orion5x_pci_disabled)
+ if (nr = 1 && !orion5x_pci_disabled)
- return pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,
+ return pci_scan_root_bus(NULL, -1, sys->busnr, &pci_ops, sys,
&sys->resources);
@@ -174,7 +174,7 @@ index 1be65eb..d528814 100644
- &resources);
+ bus = pci_scan_root_bus(NULL, controller->segment, busnum,
+ &pci_root_ops, controller, &resources);
- if (bus == NULL) {
+ if (bus = NULL) {
kfree(res);
kfree(controller);
diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
@@ -202,7 +202,7 @@ index ae838ed..d232c8a 100644
- hose->ops, hose, &resources);
+ bus = pci_scan_root_bus(hose->parent, hose->global_number,
+ hose->first_busno, hose->ops, hose, &resources);
- if (bus == NULL) {
+ if (bus = NULL) {
pr_err("Failed to create bus for PCI domain %04x\n",
hose->global_number);
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
@@ -232,7 +232,7 @@ index 2a525c9..9913f6c 100644
- hose->ops, hose, &resources);
+ bus = pci_create_root_bus(hose->parent, hose->global_number,
+ hose->first_busno, hose->ops, hose, &resources);
- if (bus == NULL) {
+ if (bus = NULL) {
pr_err("Failed to create bus for PCI domain %04x\n",
hose->global_number);
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
@@ -397,8 +397,7 @@ index dceb9dd..2949030 100644
@@ -1563,7 +1563,7 @@ lba_driver_probe(struct parisc_device *dev)
dev->dev.platform_data = lba_dev;
- lba_bus = lba_dev->hba.hba_bus =
-- pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,
+ lba_bus = lba_dev->hba.hba_bus - pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,
+ pci_create_root_bus(&dev->dev, 0, lba_dev->hba.bus_num.start,
cfg_ops, NULL, &resources);
if (!lba_bus) {
diff --git a/a/content_digest b/N3/content_digest
index c9677f2..6f75faf 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -8,29 +8,29 @@
"Subject\0[PATCH v7 03/31] PCI: Save domain in pci_host_bridge\0"
]
[
- "Date\0Mon, 23 Mar 2015 20:40:29 +0800\0"
+ "Date\0Mon, 23 Mar 2015 12:40:29 +0000\0"
]
[
"To\0Bjorn Helgaas <bhelgaas\@google.com>\0"
]
[
"Cc\0Jiang Liu <jiang.liu\@linux.intel.com>",
- " <linux-pci\@vger.kernel.org>",
+ " linux-pci\@vger.kernel.org",
" Yinghai Lu <yinghai\@kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
+ " linux-kernel\@vger.kernel.org",
" Marc Zyngier <marc.zyngier\@arm.com>",
- " <linux-arm-kernel\@lists.infradead.org>",
+ " linux-arm-kernel\@lists.infradead.org",
" Russell King <linux\@arm.linux.org.uk>",
- " <x86\@kernel.org>",
+ " x86\@kernel.org",
" Thomas Gleixner <tglx\@linutronix.de>",
" Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
" Rusty Russell <rusty\@rustcorp.com.au>",
" Tony Luck <tony.luck\@intel.com>",
- " <linux-ia64\@vger.kernel.org>",
+ " linux-ia64\@vger.kernel.org",
" David S. Miller <davem\@davemloft.net>",
" Guan Xuetao <gxt\@mprc.pku.edu.cn>",
- " <linux-alpha\@vger.kernel.org>",
- " <linux-m68k\@vger.kernel.org>",
+ " linux-alpha\@vger.kernel.org",
+ " linux-m68k\@vger.kernel.org",
" Liviu Dudau <liviu\@dudau.co.uk>",
" Arnd Bergmann <arnd\@arndb.de>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
@@ -181,12 +181,12 @@
"\@\@ -558,11 +558,11 \@\@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)\n",
" struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys)\n",
" {\n",
- " \tif (nr == 0)\n",
+ " \tif (nr = 0)\n",
"-\t\treturn pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,\n",
"+\t\treturn pci_scan_root_bus(NULL, -1, sys->busnr, &pcie_ops, sys,\n",
" \t\t\t\t\t &sys->resources);\n",
" \n",
- " \tif (nr == 1 && !orion5x_pci_disabled)\n",
+ " \tif (nr = 1 && !orion5x_pci_disabled)\n",
"-\t\treturn pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys,\n",
"+\t\treturn pci_scan_root_bus(NULL, -1, sys->busnr, &pci_ops, sys,\n",
" \t\t\t\t\t &sys->resources);\n",
@@ -219,7 +219,7 @@
"-\t\t\t\t&resources);\n",
"+\tbus = pci_scan_root_bus(NULL, controller->segment, busnum,\n",
"+\t\t\t&pci_root_ops, controller, &resources);\n",
- " \tif (bus == NULL) {\n",
+ " \tif (bus = NULL) {\n",
" \t\tkfree(res);\n",
" \t\tkfree(controller);\n",
"diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c\n",
@@ -247,7 +247,7 @@
"-\t\t\t\those->ops, hose, &resources);\n",
"+\tbus = pci_scan_root_bus(hose->parent, hose->global_number,\n",
"+\t\t\those->first_busno, hose->ops, hose, &resources);\n",
- " \tif (bus == NULL) {\n",
+ " \tif (bus = NULL) {\n",
" \t\tpr_err(\"Failed to create bus for PCI domain %04x\\n\",\n",
" \t\t hose->global_number);\n",
"diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c\n",
@@ -277,7 +277,7 @@
"-\t\t\t\t hose->ops, hose, &resources);\n",
"+\tbus = pci_create_root_bus(hose->parent, hose->global_number,\n",
"+\t\t\those->first_busno, hose->ops, hose, &resources);\n",
- " \tif (bus == NULL) {\n",
+ " \tif (bus = NULL) {\n",
" \t\tpr_err(\"Failed to create bus for PCI domain %04x\\n\",\n",
" \t\t\those->global_number);\n",
"diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c\n",
@@ -442,8 +442,7 @@
"\@\@ -1563,7 +1563,7 \@\@ lba_driver_probe(struct parisc_device *dev)\n",
" \n",
" \tdev->dev.platform_data = lba_dev;\n",
- " \tlba_bus = lba_dev->hba.hba_bus =\n",
- "-\t\tpci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,\n",
+ " \tlba_bus = lba_dev->hba.hba_bus -\t\tpci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start,\n",
"+\t\tpci_create_root_bus(&dev->dev, 0, lba_dev->hba.bus_num.start,\n",
" \t\t\t\t cfg_ops, NULL, &resources);\n",
" \tif (!lba_bus) {\n",
@@ -657,4 +656,4 @@
"1.7.1"
]
-8877766453923702ddb0fdcc6a57b424a45a849bb77237578d02c1c079151c2d
+a3e3f28c2446db21479db4e7ec5bba2118dc61d4ac1996ef6ff894b12f5611c3
diff --git a/a/content_digest b/N4/content_digest
index c9677f2..fd09680 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -14,27 +14,27 @@
"To\0Bjorn Helgaas <bhelgaas\@google.com>\0"
]
[
- "Cc\0Jiang Liu <jiang.liu\@linux.intel.com>",
- " <linux-pci\@vger.kernel.org>",
- " Yinghai Lu <yinghai\@kernel.org>",
- " <linux-kernel\@vger.kernel.org>",
- " Marc Zyngier <marc.zyngier\@arm.com>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " Russell King <linux\@arm.linux.org.uk>",
- " <x86\@kernel.org>",
- " Thomas Gleixner <tglx\@linutronix.de>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
+ "Cc\0Liviu Dudau <liviu\@dudau.co.uk>",
" Rusty Russell <rusty\@rustcorp.com.au>",
- " Tony Luck <tony.luck\@intel.com>",
- " <linux-ia64\@vger.kernel.org>",
- " David S. Miller <davem\@davemloft.net>",
- " Guan Xuetao <gxt\@mprc.pku.edu.cn>",
- " <linux-alpha\@vger.kernel.org>",
- " <linux-m68k\@vger.kernel.org>",
- " Liviu Dudau <liviu\@dudau.co.uk>",
+ " Russell King <linux\@arm.linux.org.uk>",
" Arnd Bergmann <arnd\@arndb.de>",
+ " Marc Zyngier <marc.zyngier\@arm.com>",
+ " linux-pci\@vger.kernel.org",
+ " x86\@kernel.org",
+ " linux-m68k\@lists.linux-m68k.org",
+ " linux-kernel\@vger.kernel.org",
+ " David S. Miller <davem\@davemloft.net>",
+ " linux-alpha\@vger.kernel.org",
+ " Tony Luck <tony.luck\@intel.com>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
- " Yijing Wang <wangyijing\@huawei.com>\0"
+ " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
+ " Yijing Wang <wangyijing\@huawei.com>",
+ " linux-ia64\@vger.kernel.org",
+ " Thomas Gleixner <tglx\@linutronix.de>",
+ " Guan Xuetao <gxt\@mprc.pku.edu.cn>",
+ " Yinghai Lu <yinghai\@kernel.org>",
+ " Jiang Liu <jiang.liu\@linux.intel.com>",
+ " linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -657,4 +657,4 @@
"1.7.1"
]
-8877766453923702ddb0fdcc6a57b424a45a849bb77237578d02c1c079151c2d
+092141429b51e42ae3a5c4a8ce7067beeb5cd03ce71c8fb62511c1cd49ab6ff3
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.