projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 889e4dd 63af8f7)
Merge branch 'pci/virtualization' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:36:12 +0000 (10:36 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:36:12 +0000 (10:36 -0500)
commitef1b5dad5a386885998d11eb45ca7fd183079965
treef065b28a01dbe57ef28ace9b88dfbf9c2fe49b09tree
parent889e4dd916a1f4dc7f9e6220fed26d811e39ca71commit | diff
parent63af8f7a8293b94787763c933abfd21ba852807fcommit | 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
drivers/pci/pci-driver.c diff1 | diff2 | blob | history
drivers/pci/pci-sysfs.c diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
drivers/pci/pci.h diff1 | diff2 | blob | history
drivers/pci/quirks.c diff1 | diff2 | blob | history
include/linux/pci.h diff1 | diff2 | blob | history
MicroBlaze GIT Repository