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)
commit5c7e3f3f5cbc31118914ceee969154582ad3aa6b
treed40e726a59bbacb47e6e9d73fcd3a9337c74bc06
parent4a5bb973fa0353d25dbe854694c71bb58eb4cf78
parent9def3b1a07c41e21c68a0eb353e3e569fdd1d2b1
Merge tag 'iommu-fix-v5.10' of git://git./linux/kernel/git/joro/iommu

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
drivers/iommu/intel/dmar.c