From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2014 15:41:41 +0000 (-0600)
Subject: Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v6.6-pxa1908~22773
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=cc8a44c671fd3a2c792e9e1f59ea1df52697cc8b;p=linux.git

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
---

cc8a44c671fd3a2c792e9e1f59ea1df52697cc8b