Merge branch 'pci/msi' into next

* pci/msi:
  PCI/MSI: Add pci_enable_msi_range() and pci_enable_msix_range()
  PCI/MSI: Add pci_msix_vec_count()
  PCI/MSI: Remove pci_enable_msi_block_auto()
  PCI/MSI: Add pci_msi_vec_count()

diff --cc drivers/pci/msi.c
Simple merge

diff --cc drivers/pci/pcie/portdrv_core.c
Simple merge

diff --cc include/linux/pci.h
Simple merge