| commit | ef1b5dad5a386885998d11eb45ca7fd183079965 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:36:12 2017 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:36:12 2017 -0500 |
| tree | f065b28a01dbe57ef28ace9b88dfbf9c2fe49b09 | |
| parent | 889e4dd916a1f4dc7f9e6220fed26d811e39ca71 [diff] | |
| parent | 63af8f7a8293b94787763c933abfd21ba852807f [diff] |
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