]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge tag 'vfio-v3.11-rc4' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Aug 2013 00:53:38 +0000 (17:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Aug 2013 00:53:38 +0000 (17:53 -0700)
Pull vfio fixes from Alex Williamson:
 "misc fixes around overreacting to bus notifier events and a locking
  fix for a corner case blocked remove"

* tag 'vfio-v3.11-rc4' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Avoid deadlock on remove
  vfio: Ignore sprurious notifies
  vfio: Don't overreact to DEL_DEVICE


Trivial merge