Merge branch 'pci/virtualization' into next

* pci/virtualization:
  ixgbe: Use pcie_flr() instead of duplicating it
  IB/hfi1: Use pcie_flr() instead of duplicating it
  PCI: Call pcie_flr() from reset_chelsio_generic_dev()
  PCI: Call pcie_flr() from reset_intel_82599_sfp_virtfn()
  PCI: Export pcie_flr()
  PCI: Add sysfs sriov_drivers_autoprobe to control VF driver binding
  PCI: Avoid FLR for Intel 82579 NICs

Conflicts:
	include/linux/pci.h

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

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

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

diff --cc drivers/pci/pci.h
index 71fa82359b5b3565287cb6f0f81269ac58acf5c4,3ba7d586f5225f98f01891dcf6b80c56ec6bb6e9..586e63f5501366b288b9df8207b3043751ec143b
--- 1/drivers/pci/pci.h
--- 2/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -272,22 -272,9 +272,23 @@@ struct pci_sriov 
        struct pci_dev *self;   /* this PF */
        struct mutex lock;      /* lock for setting sriov_numvfs in sysfs */
        resource_size_t barsz[PCI_SRIOV_NUM_BARS];      /* VF BAR size */
+       bool drivers_autoprobe; /* auto probing of VFs by driver */
  };
  
 +/* pci_dev priv_flags */
 +#define PCI_DEV_DISCONNECTED 0
 +
 +static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused)
 +{
 +      set_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags);
 +      return 0;
 +}
 +
 +static inline bool pci_dev_is_disconnected(const struct pci_dev *dev)
 +{
 +      return test_bit(PCI_DEV_DISCONNECTED, &dev->priv_flags);
 +}
 +
  #ifdef CONFIG_PCI_ATS
  void pci_restore_ats_state(struct pci_dev *dev);
  #else

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

diff --cc include/linux/pci.h
index bbd17d49c94770c9afc2ec43ff996cece2740430,a9ff99c916014a0df5da6f02191fe16379850ed7..88185ffcbf47c18756aba77915066d3413fd10bd
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -179,8 -178,8 +179,10 @@@ enum pci_dev_flags 
        PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),
        /* Get VPD from function 0 VPD */
        PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8),
 +      /* a non-root bridge where translation occurs, stop alias search here */
 +      PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
+       /* Do not use FLR even if device advertises PCI_AF_CAP */
+       PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
  };
  
  enum pci_irq_reroute_variant {