diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
| commit | 7b4bc1011182bacd5bec8bf6c2c5096ecbb80061 (patch) | |
| tree | 5a27abbe0cefb4e5b076e19dee7a9480727e5f28 /drivers/fpga/fpga-mgr.c | |
| parent | Merge branch 'pci/host/rcar' (diff) | |
| parent | PCI: vmd: depend on !UML (diff) | |
| download | linux-dev-7b4bc1011182bacd5bec8bf6c2c5096ecbb80061.tar.xz linux-dev-7b4bc1011182bacd5bec8bf6c2c5096ecbb80061.zip | |
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
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions