projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cb7c15 db7d4d7)
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)
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


Trivial merge
John Crispins staging tree