diff for duplicates of <20150820212109.GB14810@google.com> diff --git a/a/1.txt b/N1/1.txt index 3e2b5f2..4fe0dab 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,8 +73,8 @@ index cefd636..b978bbf 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -997,7 +997,12 @@ void set_pcie_port_type(struct pci_dev *pdev) - else if (type == PCI_EXP_TYPE_UPSTREAM || - type == PCI_EXP_TYPE_DOWNSTREAM) { + else if (type = PCI_EXP_TYPE_UPSTREAM || + type = PCI_EXP_TYPE_DOWNSTREAM) { parent = pci_upstream_bridge(pdev); - if (!parent->has_secondary_link) + diff --git a/a/content_digest b/N1/content_digest index 0252edb..44a186f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020150820.135832.47467691959908917.davem@davemloft.net\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH] PCI/ASPM: Fix a NULL pointer crash on sparc64\0" - "Date\0Thu, 20 Aug 2015 16:21:09 -0500\0" + "Date\0Thu, 20 Aug 2015 21:21:09 +0000\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0wangyijing@huawei.com" linux-pci@vger.kernel.org @@ -89,8 +89,8 @@ "--- a/drivers/pci/probe.c\n" "+++ b/drivers/pci/probe.c\n" "@@ -997,7 +997,12 @@ void set_pcie_port_type(struct pci_dev *pdev)\n" - " \telse if (type == PCI_EXP_TYPE_UPSTREAM ||\n" - " \t\t type == PCI_EXP_TYPE_DOWNSTREAM) {\n" + " \telse if (type = PCI_EXP_TYPE_UPSTREAM ||\n" + " \t\t type = PCI_EXP_TYPE_DOWNSTREAM) {\n" " \t\tparent = pci_upstream_bridge(pdev);\n" "-\t\tif (!parent->has_secondary_link)\n" "+\n" @@ -103,4 +103,4 @@ " \t}\n" } -442c2dd66027c4f4a37f02a5312186bc70216d269697f27ff744b7f1ed12758f +cf37ed2ed5f5ae163bd0a85ac507a26680cc35d4bbf6b84dfceec591d376c48b
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.