Merge remote-tracking branch 'iommu/next'

Conflicts:
	drivers/gpu/drm/msm/Kconfig

diff --cc drivers/gpu/drm/msm/Kconfig
index bb103fb4519ead8c9c1e698a341d50273fc5da94,d3de8e1ae915761605109e5d96bf86d762af71d4..81da23addf444a066bb265995a0c5dc685556343
--- 1/drivers/gpu/drm/msm/Kconfig
--- 2/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@@ -2,7 -2,9 +2,8 @@@
  config DRM_MSM
        tristate "MSM DRM"
        depends on DRM
 -      depends on ARCH_MSM
 -      depends on ARCH_MSM8960
 +      depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST)
+       depends on MSM_IOMMU
        select DRM_KMS_HELPER
        select SHMEM
        select TMPFS

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