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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits)
  iommu/core: Remove global iommu_ops and register_iommu
  iommu/msm: Use bus_set_iommu instead of register_iommu
  iommu/omap: Use bus_set_iommu instead of register_iommu
  iommu/vt-d: Use bus_set_iommu instead of register_iommu
  iommu/amd: Use bus_set_iommu instead of register_iommu
  iommu/core: Use bus->iommu_ops in the iommu-api
  iommu/core: Convert iommu_found to iommu_present
  iommu/core: Add bus_type parameter to iommu_domain_alloc
  Driver core: Add iommu_ops to bus_type
  iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API
  iommu/amd: Fix wrong shift direction
  iommu/omap: always provide iommu debug code
  iommu/core: let drivers know if an iommu fault handler isn't installed
  iommu/core: export iommu_set_fault_handler()
  iommu/omap: Fix build error with !IOMMU_SUPPORT
  iommu/omap: Migrate to the generic fault report mechanism
  iommu/core: Add fault reporting mechanism
  iommu/core: Use PAGE_SIZE instead of hard-coded value
  iommu/core: use the existing IS_ALIGNED macro
  iommu/msm: ->unmap() should return order of unmapped page
  ...

Fixup trivial conflicts in drivers/iommu/Makefile: "move omap iommu to
dedicated iommu folder" vs "Rename the DMAR and INTR_REMAP config
options" just happened to touch lines next to each other.

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

diff --cc drivers/iommu/Makefile
index 6394994a2b9dafff89522e1bb22ad021c09d30fb,f798cdd3699e2081fbed2fec81eec9f409d155b2..2f4448794bc793133d5f1e8a3145be4c1cc685b3
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@ -1,6 -1,8 +1,9 @@@
  obj-$(CONFIG_IOMMU_API) += iommu.o
  obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o
  obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
 -obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o
 -obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
 +obj-$(CONFIG_DMAR_TABLE) += dmar.o
 +obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o
 +obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o
+ obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
+ obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o
+ obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

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

diff --cc include/linux/device.h
Simple merge

diff --cc virt/kvm/iommu.c
Simple merge