From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:53 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/vmd'
X-Git-Tag: ceph-for-5.16-rc6~198^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b4bc1011182bacd5bec8bf6c2c5096ecbb80061;p=ceph-client.git

Merge branch 'remotes/lorenzo/pci/vmd'

- Assign a number to each VMD controller to distinguish them in
  /proc/interrupts (Chunguang Xu)

- Don't disable VMD MSI-X remapping if IOMMU remapping is enabled (Adrian
  Huang)

- Add Kconfig dependency on !UML for allyesconfig build issue (Johannes
  Berg)

* remotes/lorenzo/pci/vmd:
  PCI: vmd: depend on !UML
  PCI: vmd: Do not disable MSI-X remapping if interrupt remapping is enabled by IOMMU
  PCI: vmd: Assign a number to each VMD controller
---

7b4bc1011182bacd5bec8bf6c2c5096ecbb80061