commit 27ab862a3afdd7a0285b69a7475f8af7bd2434c4
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jun 30 10:37:48 2017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jun 30 10:37:48 2017 -0700
tree ba8b6be81c3019b1e59c00ec526113c779f65747
parent 4adc6b9382d5a2c1f39fa44b1e6ff29467e844e5
parent 84a21dbdef0b96d773599c33c2afbb002198d303

Merge tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
 "Two fixes:

   - A fix for AMD IOMMU interrupt remapping code when IRQs are
     forwarded directly to KVM guests

   - Fixed check in the recently merged code to allow tboot with
     Intel VT-d disabled"

* tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/amd: Fix interrupt remapping when disable guest_mode
  iommu/vt-d: Correctly disable Intel IOMMU force on