Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/s390/kvm/pci.c
Simple merge

diff --cc drivers/dma/idxd/cdev.c
Simple merge

diff --cc drivers/dma/idxd/init.c
Simple merge

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

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

diff --cc drivers/iommu/intel/dmar.c
Simple merge

diff --cc drivers/iommu/intel/iommu.c
index 644ca49,48cdcd0,48cdcd0,48cdcd0,48cdcd0,48cdcd0,48cdcd0,48cdcd0,a3db7ac,48cdcd0,f298e51..5fa52a0
--- 1/drivers/iommu/intel/iommu.c
--- 2/drivers/iommu/intel/iommu.c
--- 3/drivers/iommu/intel/iommu.c
--- 4/drivers/iommu/intel/iommu.c
--- 5/drivers/iommu/intel/iommu.c
--- 6/drivers/iommu/intel/iommu.c
--- 7/drivers/iommu/intel/iommu.c
--- 8/drivers/iommu/intel/iommu.c
--- 9/drivers/iommu/intel/iommu.c
--- 10/drivers/iommu/intel/iommu.c
--- 11/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@@@@@@@@@@@ -959,9 -959,11 -959,11 -959,11 -959,11 -959,11 -959,11 -959,11 -942,9 -959,11 -959,11 +942,9 @@@@@@@@@@@@ static struct dma_pte *pfn_to_dma_pte(s
           
                                domain_flush_cache(domain, tmp_page, VTD_PAGE_SIZE);
                                pteval = ((uint64_t)virt_to_dma_pfn(tmp_page) << VTD_PAGE_SHIFT) | DMA_PTE_READ | DMA_PTE_WRITE;
-                               if (domain_use_first_level(domain))
 ------- --                     if (domain_use_first_level(domain)) {
 ------- --                             pteval |= DMA_FL_PTE_XD | DMA_FL_PTE_US;
 ------- --                             if (iommu_is_dma_domain(&domain->domain))
 ------- --                                     pteval |= DMA_FL_PTE_ACCESS;
 ------- --                     }
++++++++ ++                     if (domain->use_first_level)
 +++++++ ++                             pteval |= DMA_FL_PTE_XD | DMA_FL_PTE_US | DMA_FL_PTE_ACCESS;
 +++++++ ++
                                if (cmpxchg64(&pte->val, 0ULL, pteval))
                                        /* Someone else set it while we were thinking; use theirs. */
                                        free_pgtable_page(tmp_page);

diff --cc drivers/iommu/intel/iommu.h
Simple merge

diff --cc drivers/iommu/intel/pasid.c
Simple merge

diff --cc drivers/iommu/intel/svm.c
Simple merge

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