From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 May 2015 15:18:01 +0000 (-0700)
Subject: Merge tag 'vfio-v4.1-rc3' of git://github.com/awilliam/linux-vfio
X-Git-Tag: omap-for-v4.2/omap1-v2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbcd1b86dcec982d2d3abec8db5da208b075f52;p=pandora-kernel.git

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

7bbcd1b86dcec982d2d3abec8db5da208b075f52