Merge tag 'iommu-fix-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Oct 2020 16:35:06 +0000 (09:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Oct 2020 16:35:06 +0000 (09:35 -0700)
Pull iommu fix from Joerg Roedel:
 "Fix a build regression with !CONFIG_IOMMU_API"

* tag 'iommu-fix-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built

1  2 
drivers/iommu/intel/dmar.c

Simple merge