Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jun 2016 19:25:36 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Jun 2016 19:25:36 +0000 (12:25 -0700)
commitf2c6b9e4b2708ae50e3ab8c91dcad1564974f2a4
tree8777edeb0e3b741da4254a0d273275913b097464
parent95b46aeb05c53726236a2a468ad16119afd42b2c
parentce7585f3c4d76bca1dff4b66ae1ea32552954f9e
Merge tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio

Pull VFIO fixes from Alex Williamson:
 "Fix irqfd shutdown ordering, build warning, and VPD short read"

* tag 'vfio-v4.7-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/pci: Allow VPD short read
  vfio/type1: Fix build warning
  vfio/pci: Fix ordering of eventfd vs virqfd shutdown