From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Dec 2018 20:58:34 +0000 (-0800)
Subject: Merge tag 'pci-v4.20-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: ceph-for-4.20-rc7~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b24f6c082b3777749ccd19c9beb8643fa718480;p=ceph-client.git

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

Pull PCI fixes from Bjorn Helgaas:
 "Revert ASPM change that caused a regression"

* tag 'pci-v4.20-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set"
---

7b24f6c082b3777749ccd19c9beb8643fa718480