From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jan 2017 20:10:58 +0000 (-0800)
Subject: Merge tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio
X-Git-Tag: Ubuntu-4.10.0-7.9~681
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3aebae061cea6f6627ab882a73de7b0b21af3127;p=mirror_ubuntu-zesty-kernel.git

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
---

3aebae061cea6f6627ab882a73de7b0b21af3127