From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Nov 2020 18:20:16 +0000 (-0800)
Subject: Merge tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: microblaze-v5.12~335
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314;p=linux-2.6-microblaze.git

Merge tag 'iommu-fixes' of git://git./linux/kernel/git/arm64/linux

Pull iommu fixes from Will Deacon:
 "Two straightforward vt-d fixes:

   - Fix boot when intel iommu initialisation fails under TXT (tboot)

   - Fix intel iommu compilation error when DMAR is enabled without ATS

  and temporarily update IOMMU MAINTAINERs entry"

* tag 'iommu-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  MAINTAINERS: Temporarily add myself to the IOMMU entry
  iommu/vt-d: Fix compile error with CONFIG_PCI_ATS not set
  iommu/vt-d: Avoid panic if iommu init fails in tboot system
---

fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314