Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Stop clearing bridge Secondary Status when setting up I/O aperture
  PCI: Prevent bus conflicts while checking for bridge apertures
  PCI: Drop "irq" param from *_restore_msi_irqs()
  PCI/portdrv: Remove superfluous name cast
  PCI: Export MSI mode in sysfs using attributes, not kobjects
  PCI: Clear NumVFs when disabling SR-IOV in sriov_init()

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