Merge branch 'remotes/lorenzo/pci/vmd'
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:53 +0000 (11:28 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 5 Nov 2021 16:28:53 +0000 (11:28 -0500)
commit7b4bc1011182bacd5bec8bf6c2c5096ecbb80061
tree5a27abbe0cefb4e5b076e19dee7a9480727e5f28
parent607f7f0b4cb22059a4ed4c2bb69987da9894f8a4
parent42cf2a633d5dc2b5abc440d61b6c1c5fb7dddbbb
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
drivers/pci/controller/Kconfig
drivers/pci/controller/vmd.c