Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2014 15:41:41 +0000 (09:41 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Aug 2014 15:41:41 +0000 (09:41 -0600)
commitcc8a44c671fd3a2c792e9e1f59ea1df52697cc8b
tree9521e782447bb95bb04772aeb274d5387e4cdda1
parent4dacb91c7d1ab30aa9aac0d55216fc177d454254
parent9b936c960f22954bfb89f2fefd8f96916bb42908
Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:
 - enable support for bus reset on device release
 - fixes for EEH support

* tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio:
  drivers/vfio: Enable VFIO if EEH is not supported
  drivers/vfio: Allow EEH to be built as module
  drivers/vfio: Fix EEH build error
  vfio-pci: Attempt bus/slot reset on release
  vfio-pci: Use mutex around open, release, and remove
  vfio-pci: Release devices with BusMaster disabled