diff for duplicates of <546BF09C.4030209@huawei.com> diff --git a/a/1.txt b/N1/1.txt index c34b6ec..27bb07e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -103,7 +103,7 @@ OK, I will separately this one out of this series. >> --- a/arch/ia64/sn/kernel/io_init.c >> +++ b/arch/ia64/sn/kernel/io_init.c >> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) ->> if (bus = NULL) { +>> if (bus == NULL) { >> kfree(res); >> kfree(controller); >> + return; diff --git a/a/content_digest b/N1/content_digest index b39052e..3900f67 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020141118143402.GJ12037@e106497-lin.cambridge.arm.com\0" "From\0Yijing Wang <wangyijing@huawei.com>\0" "Subject\0Re: [RFC PATCH 04/16] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus()\0" - "Date\0Wed, 19 Nov 2014 01:21:32 +0000\0" + "Date\0Wed, 19 Nov 2014 09:21:32 +0800\0" "To\0Liviu Dudau <Liviu.Dudau@arm.com>\0" "Cc\0Bjorn Helgaas <bhelgaas@google.com>" linux-pci@vger.kernel.org <linux-pci@vger.kernel.org> @@ -128,7 +128,7 @@ ">> --- a/arch/ia64/sn/kernel/io_init.c\n" ">> +++ b/arch/ia64/sn/kernel/io_init.c\n" ">> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)\n" - ">> if (bus = NULL) {\n" + ">> if (bus == NULL) {\n" ">> kfree(res);\n" ">> kfree(controller);\n" ">> + return;\n" @@ -395,4 +395,4 @@ "Thanks!\n" Yijing -2075ae957ff3d3eb3fc00545e398346945fbd5ff9c7be086b16acd16b6b8a8fe +a6622836d7e1f57a21e15f2abcb51612e29c4a1a2e62bc0e810cbb4d2baf08b4
diff --git a/a/1.txt b/N2/1.txt index c34b6ec..27bb07e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -103,7 +103,7 @@ OK, I will separately this one out of this series. >> --- a/arch/ia64/sn/kernel/io_init.c >> +++ b/arch/ia64/sn/kernel/io_init.c >> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) ->> if (bus = NULL) { +>> if (bus == NULL) { >> kfree(res); >> kfree(controller); >> + return; diff --git a/a/content_digest b/N2/content_digest index b39052e..682269a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,24 +3,23 @@ "ref\020141118143402.GJ12037@e106497-lin.cambridge.arm.com\0" "From\0Yijing Wang <wangyijing@huawei.com>\0" "Subject\0Re: [RFC PATCH 04/16] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus()\0" - "Date\0Wed, 19 Nov 2014 01:21:32 +0000\0" + "Date\0Wed, 19 Nov 2014 09:21:32 +0800\0" "To\0Liviu Dudau <Liviu.Dudau@arm.com>\0" - "Cc\0Bjorn Helgaas <bhelgaas@google.com>" + "Cc\0Liviu Dudau <liviu@dudau.co.uk>" + Tony Luck <tony.luck@intel.com> + Russell King <linux@arm.linux.org.uk> linux-pci@vger.kernel.org <linux-pci@vger.kernel.org> + x86@kernel.org <x86@kernel.org> linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> huxinwei@huawei.com <huxinwei@huawei.com> - Wuyun <wuyun.wu@huawei.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> + Thierry Reding <thierry.reding@gmail.com> + suravee.suthikulpanit@amd.com <suravee.suthikulpanit@amd.com> + Bjorn Helgaas <bhelgaas@google.com> + linux-ia64@vger.kernel.org <linux-ia64@vger.kernel.org> Thomas Gleixner <tglx@linutronix.de> - Benjamin Herrenschmidt <benh@kernel.crashing.org> + Wuyun <wuyun.wu@huawei.com> linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - Tony Luck <tony.luck@intel.com> - linux-ia64@vger.kernel.org <linux-ia64@vger.kernel.org> - Thierry Reding <thierry.reding@gmail.com> - Liviu Dudau <liviu@dudau.co.uk> - " suravee.suthikulpanit@amd.com <suravee.suthikulpanit@amd.com>\0" + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "On 2014/11/18 22:34, Liviu Dudau wrote:\n" @@ -128,7 +127,7 @@ ">> --- a/arch/ia64/sn/kernel/io_init.c\n" ">> +++ b/arch/ia64/sn/kernel/io_init.c\n" ">> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)\n" - ">> if (bus = NULL) {\n" + ">> if (bus == NULL) {\n" ">> kfree(res);\n" ">> kfree(controller);\n" ">> + return;\n" @@ -395,4 +394,4 @@ "Thanks!\n" Yijing -2075ae957ff3d3eb3fc00545e398346945fbd5ff9c7be086b16acd16b6b8a8fe +38e427351238c7ebefd8aff2a053f1bb4a10f9e9994a690dc8c0edcef6fe2ce5
diff --git a/a/1.txt b/N3/1.txt index c34b6ec..0a9dd95 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -103,7 +103,7 @@ OK, I will separately this one out of this series. >> --- a/arch/ia64/sn/kernel/io_init.c >> +++ b/arch/ia64/sn/kernel/io_init.c >> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) ->> if (bus = NULL) { +>> if (bus == NULL) { >> kfree(res); >> kfree(controller); >> + return; @@ -360,7 +360,7 @@ OK, I will separately this one out of this series. >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in ->> the body of a message to majordomo@vger.kernel.org +>> the body of a message to majordomo at vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> > diff --git a/a/content_digest b/N3/content_digest index b39052e..4510cc8 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,26 +1,10 @@ "ref\01416219710-26088-1-git-send-email-wangyijing@huawei.com\0" "ref\01416219710-26088-5-git-send-email-wangyijing@huawei.com\0" "ref\020141118143402.GJ12037@e106497-lin.cambridge.arm.com\0" - "From\0Yijing Wang <wangyijing@huawei.com>\0" - "Subject\0Re: [RFC PATCH 04/16] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus()\0" - "Date\0Wed, 19 Nov 2014 01:21:32 +0000\0" - "To\0Liviu Dudau <Liviu.Dudau@arm.com>\0" - "Cc\0Bjorn Helgaas <bhelgaas@google.com>" - linux-pci@vger.kernel.org <linux-pci@vger.kernel.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - huxinwei@huawei.com <huxinwei@huawei.com> - Wuyun <wuyun.wu@huawei.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> - linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - Tony Luck <tony.luck@intel.com> - linux-ia64@vger.kernel.org <linux-ia64@vger.kernel.org> - Thierry Reding <thierry.reding@gmail.com> - Liviu Dudau <liviu@dudau.co.uk> - " suravee.suthikulpanit@amd.com <suravee.suthikulpanit@amd.com>\0" + "From\0wangyijing@huawei.com (Yijing Wang)\0" + "Subject\0[RFC PATCH 04/16] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus()\0" + "Date\0Wed, 19 Nov 2014 09:21:32 +0800\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 2014/11/18 22:34, Liviu Dudau wrote:\n" @@ -128,7 +112,7 @@ ">> --- a/arch/ia64/sn/kernel/io_init.c\n" ">> +++ b/arch/ia64/sn/kernel/io_init.c\n" ">> @@ -271,7 +271,9 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)\n" - ">> if (bus = NULL) {\n" + ">> if (bus == NULL) {\n" ">> kfree(res);\n" ">> kfree(controller);\n" ">> + return;\n" @@ -385,7 +369,7 @@ ">>\n" ">> --\n" ">> To unsubscribe from this list: send the line \"unsubscribe linux-pci\" in\n" - ">> the body of a message to majordomo@vger.kernel.org\n" + ">> the body of a message to majordomo at vger.kernel.org\n" ">> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" ">>\n" "> \n" @@ -395,4 +379,4 @@ "Thanks!\n" Yijing -2075ae957ff3d3eb3fc00545e398346945fbd5ff9c7be086b16acd16b6b8a8fe +02307e040e501bc4acdd08189884cec52cd85ddfa83b4b63ad87667e6dd78280
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.