]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'vfio-v4.5-rc2' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2016 22:38:37 +0000 (14:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Jan 2016 22:38:37 +0000 (14:38 -0800)
Pull VFIO fix from Alex Williamson:
 "Use alternate group tracking for no-iommu"

* tag 'vfio-v4.5-rc2' of git://github.com/awilliam/linux-vfio:
  vfio/noiommu: Don't use iommu_present() to track fake groups


Trivial merge