Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and ...

Conflicts:
	drivers/iommu/Kconfig
	drivers/iommu/Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Kconfig
index b7c656c84f51ff8c44180ca1c1d5fc3b2b519590,87060ad6829d7851f99fc09e1242971f5b6dad0d,325188eef1c18377eb2956e0e91d830986822037,325188eef1c18377eb2956e0e91d830986822037,325188eef1c18377eb2956e0e91d830986822037,db98eb70646636d887fc440ba95fbb72997cab2f..baa0d9786f506bfeff064459e1f2277cd2506b6b
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
--- 3/drivers/iommu/Kconfig
--- 4/drivers/iommu/Kconfig
--- 5/drivers/iommu/Kconfig
--- 6/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@@@@@ -13,32 -13,32 -13,6 -13,6 -13,6 -14,9 +14,35 @@@@@@@ menuconfig IOMMU_SUPPOR
      
      if IOMMU_SUPPORT
      
  ++++menu "Generic IOMMU Pagetable Support"
  ++++
  ++++# Selected by the actual pagetable implementations
  ++++config IOMMU_IO_PGTABLE
  ++++  bool
  ++++
  ++++config IOMMU_IO_PGTABLE_LPAE
  ++++  bool "ARMv7/v8 Long Descriptor Format"
  ++++  select IOMMU_IO_PGTABLE
  ++++  help
  ++++    Enable support for the ARM long descriptor pagetable format.
  ++++    This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page
  ++++    sizes at both stage-1 and stage-2, as well as address spaces
  ++++    up to 48-bits in size.
  ++++
  ++++config IOMMU_IO_PGTABLE_LPAE_SELFTEST
  ++++  bool "LPAE selftests"
  ++++  depends on IOMMU_IO_PGTABLE_LPAE
  ++++  help
  ++++    Enable self-tests for LPAE page table allocator. This performs
  ++++    a series of page-table consistency checks during boot.
  ++++
  ++++    If unsure, say N here.
  ++++
  ++++endmenu
  ++++
+++++ config IOMMU_IOVA
+++++   bool
+++++ 
      config OF_IOMMU
             def_bool y
             depends on OF && IOMMU_API
@@@@@@@ -331,9 -330,9 -304,8 -304,8 -304,8 -312,9 +339,9 @@@@@@@ config SPAPR_TCE_IOMM
      
      config ARM_SMMU
        bool "ARM Ltd. System MMU (SMMU) Support"
--      depends on ARM64 || ARM
  ----  depends on ARM64 || (ARM_LPAE && OF)
     -  depends on MMU
++++++  depends on (ARM64 || ARM) && MMU
        select IOMMU_API
  ++++  select IOMMU_IO_PGTABLE_LPAE
        select ARM_DMA_USE_IOMMU if ARM
        help
          Support for implementations of the ARM System MMU architecture

diff --cc drivers/iommu/Makefile
index d6889b487d5571ef002bde7a87f3d24cb430e14a,d6889b487d5571ef002bde7a87f3d24cb430e14a,7b976f294a695994aafe3fd99b4256ca70c95f4c,7b976f294a695994aafe3fd99b4256ca70c95f4c,7b976f294a695994aafe3fd99b4256ca70c95f4c,0b1b94ef13abf9ea6a81de519358c57aef910a34..080ffab4ed1cf07a5d66c1e6671eb0704c86d738
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
--- 3/drivers/iommu/Makefile
--- 4/drivers/iommu/Makefile
--- 5/drivers/iommu/Makefile
--- 6/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@ -1,8 -1,8 -1,6 -1,6 -1,6 -1,7 +1,9 @@@@@@@
      obj-$(CONFIG_IOMMU_API) += iommu.o
      obj-$(CONFIG_IOMMU_API) += iommu-traces.o
      obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
  ++++obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o
  ++++obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o
+++++ obj-$(CONFIG_IOMMU_IOVA) += iova.o
      obj-$(CONFIG_OF_IOMMU)    += of_iommu.o
      obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o
      obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o

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

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