From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jun 2017 17:37:48 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v4.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=27ab862a3afdd7a0285b69a7475f8af7bd2434c4;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'iommu-fixes-v4.12-rc7' of git://git./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
---

27ab862a3afdd7a0285b69a7475f8af7bd2434c4