Merge branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core' into...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
Simple merge

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

diff --cc include/linux/iommu.h
index bd722f4,bd722f4,bd722f4,bd722f4,84a6ed5,bd722f4,8cce372..9a3215b
--- 1/include/linux/iommu.h
--- 2/include/linux/iommu.h
--- 3/include/linux/iommu.h
--- 4/include/linux/iommu.h
--- 5/include/linux/iommu.h
--- 6/include/linux/iommu.h
--- 7/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@@@@@@ -784,12 -784,12 -784,12 -784,12 -784,11 -784,12 -782,14 +782,14 @@@@@@@@ static inline void iommu_iotlb_gather_i
        };
       }
       
---- --extern int bus_iommu_probe(const struct bus_type *bus);
      +extern bool iommu_present(const struct bus_type *bus);
       extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
       extern bool iommu_group_has_isolated_msi(struct iommu_group *group);
------ extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);
------ struct iommu_domain *iommu_paging_domain_alloc(struct device *dev);
++++++ struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags);
++++++ static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)
++++++ {
++++++  return iommu_paging_domain_alloc_flags(dev, 0);
++++++ }
       extern void iommu_domain_free(struct iommu_domain *domain);
       extern int iommu_attach_device(struct iommu_domain *domain,
                               struct device *dev);