diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-05 14:00:21 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-05 14:00:21 -0500 |
| commit | bdf530984d10b6b88b10a6d03057409a3f1c6897 (patch) | |
| tree | 9ae670861f37cd57c21d92bf6fb1b50c4cacd2f6 /net/netfilter/xt_bpf.c | |
| parent | 69a06e49843b29b296689fa2a7fc320d81aa7c64 (diff) | |
| parent | 181ffd19cc9898f795646bf9a897072a419a51ed (diff) | |
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
Diffstat (limited to 'net/netfilter/xt_bpf.c')
0 files changed, 0 insertions, 0 deletions