[GIT PULL] IOMMU fixes for -rc5

From: Will Deacon
Date: Fri Nov 20 2020 - 06:50:42 EST


Hi Linus,

As mentioned at [1], I'm temporarily helping out with the IOMMU tree so
here are some fixes I've collected for -rc5, including an update to
MAINTAINERS as suggested by Joerg on IRC.

Anyway, two straightforward vt-d fixes summarised in the tag. I ended up
pulling in some x86 fixes from tip which you already merged for -rc4, as
the DMAR build failure was introduced there and so I needed that in order
to apply the fix.

Please pull.

Cheers,

Will

[1] https://lore.kernel.org/lkml/20201117100953.GR22888@xxxxxxxxxx/

--->8

The following changes since commit ff828729be446b86957f7c294068758231cd2183:

iommu/vt-d: Cure VF irqdomain hickup (2020-11-13 12:00:40 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/iommu-fixes

for you to fetch changes up to 91c2c28d8de34815ea9bb4d16e9db7308ad33d3e:

MAINTAINERS: Temporarily add myself to the IOMMU entry (2020-11-19 11:12:17 +0000)

----------------------------------------------------------------
iommu fixes for -rc5

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

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

- Temporarily update IOMMU MAINTAINERs entry

----------------------------------------------------------------
Lu Baolu (1):
iommu/vt-d: Fix compile error with CONFIG_PCI_ATS not set

Will Deacon (2):
Merge tag 'x86-urgent-2020-11-15' of git://git.kernel.org/.../tip/tip into for-next/iommu/fixes
MAINTAINERS: Temporarily add myself to the IOMMU entry

Zhenzhong Duan (1):
iommu/vt-d: Avoid panic if iommu init fails in tboot system

MAINTAINERS | 1 +
arch/x86/kernel/tboot.c | 3 ---
drivers/iommu/intel/dmar.c | 4 +++-
drivers/iommu/intel/iommu.c | 5 +++--
include/linux/intel-iommu.h | 1 -
5 files changed, 7 insertions(+), 7 deletions(-)