diff for duplicates of <20150818184943.GA26431@google.com> diff --git a/a/1.txt b/N1/1.txt index cb59409..c9af641 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,8 +53,8 @@ Bjorn > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -1003,7 +1003,10 @@ 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) > + /* For sparc64 V245 and T2000, upstream port may be diff --git a/a/content_digest b/N1/content_digest index bbdafd0..423fd15 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01439808478-23253-1-git-send-email-wangyijing@huawei.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH] PCI/ASPM: Fix a NULL pointer crash on sparc64\0" - "Date\0Tue, 18 Aug 2015 13:49:43 -0500\0" + "Date\0Tue, 18 Aug 2015 18:49:43 +0000\0" "To\0Yijing Wang <wangyijing@huawei.com>\0" "Cc\0linux-pci@vger.kernel.org" mroos@linux.ee @@ -66,8 +66,8 @@ "> --- a/drivers/pci/probe.c\n" "> +++ b/drivers/pci/probe.c\n" "> @@ -1003,7 +1003,10 @@ 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" "> +\t\t/* For sparc64 V245 and T2000, upstream port may be\n" @@ -81,4 +81,4 @@ "> 1.7.1\n" > -0e6f144f1717747732c996092aac0500e84074e270da669f73ee4c46b6486b17 +207728c1354ec0e1e8aadfab37f9d9d8c279cb42780f9ef48e6e19b4c349f419
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.