Merge branch 'pci/don-sriov' into next

* pci/don-sriov:
  PCI: Remove useless "!dev" tests
  PCI: Use spec names for SR-IOV capability fields
  PCI: Provide method to reduce the number of total VFs supported
  PCI: SRIOV control and status via sysfs
  PCI: Use is_visible() with boot_vga attribute for pci_dev
  PCI: Add pci_device_type to pdev's device struct

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

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