Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
Simple merge

diff --cc drivers/iommu/intel-iommu.c
index 323dac9900ba3cc0a0c1351dfc39de86b4cb06ab,a644d0cec2d8275d202fd3d871673b7787dd258c,0a97a6da407c7d5f33c4705651c649dc92522d8c,a644d0cec2d8275d202fd3d871673b7787dd258c,a644d0cec2d8275d202fd3d871673b7787dd258c,10700945994eed2e470c92d267c0bb5723ed0d1a,10700945994eed2e470c92d267c0bb5723ed0d1a,323dac9900ba3cc0a0c1351dfc39de86b4cb06ab,cfe410eedaf0b9e7188ca462a4072443b3162bac..9d2938e12aa3a58c8b17f10049e83e1b9c384fed
--- 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
+++ b/drivers/iommu/intel-iommu.c
@@@@@@@@@@ -4607,8 -4600,8 -4600,8 -4600,8 -4600,8 -4607,8 -4607,8 -4607,8 -4607,8 +4607,8 @@@@@@@@@@ static void free_all_cpu_cached_iovas(u
                        if (!iommu)
                                continue;
         
 ------                 for (did = 0; did < 0xffff; did++) {
 ------                         domain = get_iommu_domain(iommu, did);
 ++++++                 for (did = 0; did < cap_ndoms(iommu->cap); did++) {
        -                       domain = get_iommu_domain(iommu, did);
 ++++++ +                       domain = get_iommu_domain(iommu, (u16)did);
         
                                if (!domain)
                                        continue;

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