Backport commits from master that fix boot failure on some intel machines. Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Joerg Roedel <joro@xxxxxxxxxx> Cc: Joerg Roedel <jroedel@xxxxxxx> Cc: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx> Dmitry Safonov (1): iommu/vt-d: Don't queue_iova() if there is no flush queue Joerg Roedel (1): iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/iova.c | 18 ++++++++++++++---- include/linux/iova.h | 6 ++++++ 3 files changed, 21 insertions(+), 5 deletions(-) -- 2.22.0