Merge tag 'pci-v5.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jun 2019 16:42:29 +0000 (09:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jun 2019 16:42:29 +0000 (09:42 -0700)
commitb253d5f3ecc95c2b4e8d4a525fd754c9e32b0f6e
treeb0c4130979f458d7aa20b19eb141bd5087cfcdf7
parentf4102766463a66026bd4af6c30cbbd01f10e6c42
parent6dbbd053e6aea827abde89ac9b9d6855dab1a66b
Merge tag 'pci-v5.2-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "If an IOMMU is present, ignore the P2PDMA whitelist we added for v5.2
  because we don't yet know how to support P2PDMA in that case (Logan
  Gunthorpe)"

* tag 'pci-v5.2-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
drivers/pci/p2pdma.c