Merge branch 'pci/host-vmd' into next
* pci/host-vmd: x86/PCI: VMD: Move VMD driver to drivers/pci/host x86/PCI: VMD: Synchronize with RCU freeing MSI IRQ descs x86/PCI: VMD: Eliminate index member from IRQ list x86/PCI: VMD: Eliminate vmd_vector member from list type x86/PCI: VMD: Convert to use pci_alloc_irq_vectors() API x86/PCI: VMD: Allocate IRQ lists with correct MSI-X count PCI: Use positive flags in pci_alloc_irq_vectors() PCI: Update "pci=resource_alignment" documentation Conflicts: drivers/pci/host/Kconfig drivers/pci/host/Makefile
Showing
- Documentation/PCI/MSI-HOWTO.txt 10 additions, 14 deletionsDocumentation/PCI/MSI-HOWTO.txt
- Documentation/kernel-parameters.txt 4 additions, 0 deletionsDocumentation/kernel-parameters.txt
- arch/x86/Kconfig 0 additions, 13 deletionsarch/x86/Kconfig
- arch/x86/pci/Makefile 0 additions, 2 deletionsarch/x86/pci/Makefile
- drivers/pci/host/Kconfig 16 additions, 0 deletionsdrivers/pci/host/Kconfig
- drivers/pci/host/Makefile 1 addition, 0 deletionsdrivers/pci/host/Makefile
- drivers/pci/host/vmd.c 22 additions, 26 deletionsdrivers/pci/host/vmd.c
- drivers/pci/msi.c 7 additions, 8 deletionsdrivers/pci/msi.c
- include/linux/pci.h 6 additions, 4 deletionsinclude/linux/pci.h
Loading
Please register or sign in to comment