From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Jun 2015 16:37:23 +0000 (-0700)
Subject: Merge git://git.infradead.org/intel-iommu
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=181e505952c5e4b4beb287d0022ea3cd20f23e74;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge git://git.infradead.org/intel-iommu

Pull Intel IOMMU fix from David Woodhouse:
 "This fixes an oops when attempting to enable 1:1 passthrough mode for
  devices on which VT-d translation was disabled anyway.

  It's actually a long-standing bug but recent changes (commit
  18436afdc11a: "iommu/vt-d: Allow RMRR on graphics devices too") have
  made it much easier to trigger with 'iommu=pt intel_iommu=igfx_off' on
  the command line"

* git://git.infradead.org/intel-iommu:
  iommu/vt-d: Fix passthrough mode with translation-disabled devices
---

181e505952c5e4b4beb287d0022ea3cd20f23e74