From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Feb 2017 20:34:27 +0000 (-0800)
Subject: Merge tag 'pci-v4.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~8526
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f2557779e1a9cfbf69c99b74da26cc1b2b10e752;p=mirror_ubuntu-focal-kernel.git

Merge tag 'pci-v4.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Configure ASPM on the link from a PCI-to-PCIe bridge (avoids a NULL
  pointer dereference on topologies including these bridges)"

* tag 'pci-v4.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies
---

f2557779e1a9cfbf69c99b74da26cc1b2b10e752