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


Trivial merge
John Crispins staging tree