diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 10:20:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-20 10:20:16 -0800 |
| commit | fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314 (patch) | |
| tree | e6b57d85889b4b699e22542af0863ceacbaca237 /MAINTAINERS | |
| parent | 5de18678da02d893d2c1eb149583fca23c96584a (diff) | |
| parent | 91c2c28d8de34815ea9bb4d16e9db7308ad33d3e (diff) | |
| download | linux-stable-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.tar.gz linux-stable-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.tar.bz2 linux-stable-fc8299f9f3b9f3b0e1c8c9f719b5deb2a74ab314.zip | |
Merge tag 'iommu-fixes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c7f6924d34c7..a008b70f3c16 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9162,6 +9162,7 @@ F: include/linux/iomap.h IOMMU DRIVERS M: Joerg Roedel <joro@8bytes.org> +M: Will Deacon <will@kernel.org> L: iommu@lists.linux-foundation.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git |