Merge tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 May 2015 15:18:01 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 May 2015 15:18:01 +0000 (08:18 -0700)
commit7bbcd1b86dcec982d2d3abec8db5da208b075f52
tree85b7992f387338f88c8194f12bce2d887479c4b9
parent8cb7c15b32545f9e7c4f72ffa357353109967a7a
parentdb7d4d7f40215843000cb9d441c9149fd42ea36b
Merge tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio

Pull vfio fixes from Alex Williamson:
 "Fix some undesirable behavior with the vfio device request interface:

   - increase verbosity of device request channel (Alex Williamson)

   - fix runaway interruptible timeout (Alex Williamson)"

* tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio:
  vfio: Fix runaway interruptible timeout
  vfio-pci: Log device requests more verbosely