projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d1d166 bd00fdf)
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)
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


Trivial merge
Motorola kernel-slsi