Merge tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 20:10:58 +0000 (12:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 20:10:58 +0000 (12:10 -0800)
commit3aebae061cea6f6627ab882a73de7b0b21af3127
tree4ea296a2b63b38e69e37434e7976b45cfc816c0d
parent9d1d166f18f8f0f332573b8d2e28e5b3291f09c5
parentbd00fdf198e2da475a2f4265a83686ab42d998a8
Merge tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "mdev IOMMU groups are not yet compatible with the powerpc SPAPR IOMMU
  backend, detect and fail group attach (Greg Kurz)"

* tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio:
  vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null