diff for duplicates of <20150820054800.GB10267@google.com> diff --git a/a/1.txt b/N1/1.txt index 33977d5..556268c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,8 +22,8 @@ On Mon, Aug 17, 2015 at 06:47:58PM +0800, Yijing Wang wrote: > --- 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 22da902..f3a66d9 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\0Thu, 20 Aug 2015 00:48:00 -0500\0" + "Date\0Thu, 20 Aug 2015 05:48:00 +0000\0" "To\0Yijing Wang <wangyijing@huawei.com>\0" "Cc\0linux-pci@vger.kernel.org" mroos@linux.ee @@ -35,8 +35,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" @@ -50,4 +50,4 @@ "> 1.7.1\n" > -ec364399931f7c1ad6ce482da1f3f79d2d9f85debef7a195e0614df3903af722 +b7ec4b6fce36641020b16ad40f400f7b1273b73bc4c01b712f428ac0ea84383a
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.