diff for duplicates of <20100803215137.GU26313@bicker> diff --git a/a/1.txt b/N1/1.txt index e32401c..55ae6ee 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,8 +4,8 @@ On Tue, Aug 03, 2010 at 11:35:17PM +0200, Julia Lawall wrote: > --- a/arch/powerpc/kernel/pci_of_scan.c > +++ b/arch/powerpc/kernel/pci_of_scan.c > @@ -336,8 +336,7 @@ static void __devinit __of_scan_bus(struct device_node *node, -> if (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE || -> dev->hdr_type = PCI_HEADER_TYPE_CARDBUS) { +> if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || +> dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { > struct device_node *child = pci_device_to_OF_node(dev); > - if (dev) > - of_scan_pci_bridge(child, dev); diff --git a/a/content_digest b/N1/content_digest index ac34881..c53d597 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0Pine.LNX.4.64.1008032334420.20393@ask.diku.dk\0" "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0Re: [PATCH 8/9] arch/powerpc/kernel: Drop unnecessary null test\0" - "Date\0Tue, 03 Aug 2010 21:51:38 +0000\0" + "Date\0Tue, 3 Aug 2010 23:51:38 +0200\0" "To\0Julia Lawall <julia@diku.dk>\0" "Cc\0devicetree-discuss@lists.ozlabs.org" kernel-janitors@vger.kernel.org @@ -16,8 +16,8 @@ "> --- a/arch/powerpc/kernel/pci_of_scan.c\n" "> +++ b/arch/powerpc/kernel/pci_of_scan.c\n" "> @@ -336,8 +336,7 @@ static void __devinit __of_scan_bus(struct device_node *node,\n" - "> \t\tif (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE ||\n" - "> \t\t dev->hdr_type = PCI_HEADER_TYPE_CARDBUS) {\n" + "> \t\tif (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||\n" + "> \t\t dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {\n" "> \t\t\tstruct device_node *child = pci_device_to_OF_node(dev);\n" "> -\t\t\tif (dev)\n" "> -\t\t\t\tof_scan_pci_bridge(child, dev);\n" @@ -34,4 +34,4 @@ "> \t}\n" > } -f50943df96e9896e11f48f88101a11e2bd965d5dabce27ca9d7988a4d9f70fa9 +a77a111cf87ea0a60ffe7b29a50eadda8061ae8e1585af249c6a392db005276b
diff --git a/a/1.txt b/N2/1.txt index e32401c..55ae6ee 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -4,8 +4,8 @@ On Tue, Aug 03, 2010 at 11:35:17PM +0200, Julia Lawall wrote: > --- a/arch/powerpc/kernel/pci_of_scan.c > +++ b/arch/powerpc/kernel/pci_of_scan.c > @@ -336,8 +336,7 @@ static void __devinit __of_scan_bus(struct device_node *node, -> if (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE || -> dev->hdr_type = PCI_HEADER_TYPE_CARDBUS) { +> if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE || +> dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { > struct device_node *child = pci_device_to_OF_node(dev); > - if (dev) > - of_scan_pci_bridge(child, dev); diff --git a/a/content_digest b/N2/content_digest index ac34881..dcb2a1f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,15 @@ "ref\0Pine.LNX.4.64.1008032334420.20393@ask.diku.dk\0" "From\0Dan Carpenter <error27@gmail.com>\0" "Subject\0Re: [PATCH 8/9] arch/powerpc/kernel: Drop unnecessary null test\0" - "Date\0Tue, 03 Aug 2010 21:51:38 +0000\0" + "Date\0Tue, 3 Aug 2010 23:51:38 +0200\0" "To\0Julia Lawall <julia@diku.dk>\0" - "Cc\0devicetree-discuss@lists.ozlabs.org" - kernel-janitors@vger.kernel.org - linux-kernel@vger.kernel.org + "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" + Paul Mackerras <paulus@samba.org> + Grant Likely <grant.likely@secretlab.ca> linuxppc-dev@ozlabs.org - " Paul Mackerras <paulus@samba.org>\0" + linux-kernel@vger.kernel.org + devicetree-discuss@lists.ozlabs.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, Aug 03, 2010 at 11:35:17PM +0200, Julia Lawall wrote:\n" @@ -16,8 +18,8 @@ "> --- a/arch/powerpc/kernel/pci_of_scan.c\n" "> +++ b/arch/powerpc/kernel/pci_of_scan.c\n" "> @@ -336,8 +336,7 @@ static void __devinit __of_scan_bus(struct device_node *node,\n" - "> \t\tif (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE ||\n" - "> \t\t dev->hdr_type = PCI_HEADER_TYPE_CARDBUS) {\n" + "> \t\tif (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||\n" + "> \t\t dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {\n" "> \t\t\tstruct device_node *child = pci_device_to_OF_node(dev);\n" "> -\t\t\tif (dev)\n" "> -\t\t\t\tof_scan_pci_bridge(child, dev);\n" @@ -34,4 +36,4 @@ "> \t}\n" > } -f50943df96e9896e11f48f88101a11e2bd965d5dabce27ca9d7988a4d9f70fa9 +91386c65e396cc73417ec5c5efc703ae30aeb05e68ce01f5c522543fb14eec9d
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.