Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

# Conflicts:
#	drivers/iommu/amd/amd_iommu.h

diff --cc Documentation/admin-guide/cgroup-v2.rst
Simple merge

diff --cc Documentation/filesystems/proc.rst
Simple merge

diff --cc drivers/iommu/amd/iommu.c
Simple merge

diff --cc drivers/iommu/dma-iommu.c
Simple merge

diff --cc drivers/iommu/intel/irq_remapping.c
index 0f64fa72ac4f06438ef3a1b992516371da7c049b,39cd9626eb8d08dca684d3e10544e56df74e64a9..52ca58600b899e62d26cb9e405882285d3c72ab0
--- 1/drivers/iommu/intel/irq_remapping.c
--- 2/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@@ -567,9 -568,13 +568,9 @@@ static int intel_setup_irq_remapping(st
        irq_domain_update_bus_token(iommu->ir_domain,  DOMAIN_BUS_DMAR);
        iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |
                                   IRQ_DOMAIN_FLAG_ISOLATED_MSI;
 -
 -      if (cap_caching_mode(iommu->cap))
 -              iommu->ir_domain->msi_parent_ops = &virt_dmar_msi_parent_ops;
 -      else
 -              iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops;
 +      iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops;
  
-       ir_table->base = page_address(pages);
+       ir_table->base = ir_table_base;
        ir_table->bitmap = bitmap;
        iommu->ir_table = ir_table;