Merge branches 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86...

diff --combined drivers/iommu/ipmmu-vmsa.c
index dfb868e,8cf605f,8cf605f,8cf605f,8cf605f,5b1166d,8cf605f,8cf605f..2fdbac6
--- 1/drivers/iommu/ipmmu-vmsa.c
--- 2/drivers/iommu/ipmmu-vmsa.c
--- 3/drivers/iommu/ipmmu-vmsa.c
--- 4/drivers/iommu/ipmmu-vmsa.c
--- 5/drivers/iommu/ipmmu-vmsa.c
--- 6/drivers/iommu/ipmmu-vmsa.c
--- 7/drivers/iommu/ipmmu-vmsa.c
--- 8/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@@@@@@@@ -277,8 -277,8 -277,8 -277,8 -277,8 -277,8 -277,8 -277,8 +277,8 @@@@@@@@@ static void ipmmu_tlb_flush_all(void *c
                ipmmu_tlb_invalidate(domain);
        }
        
----- --static void ipmmu_tlb_add_flush(unsigned long iova, size_t size, bool leaf,
----- --                                void *cookie)
+++++ ++static void ipmmu_tlb_add_flush(unsigned long iova, size_t size,
+++++ ++                                size_t granule, bool leaf, void *cookie)
        {
                /* The hardware doesn't support selective TLB flush. */
        }
@@@@@@@@@ -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 -295,7 +295,7 @@@@@@@@@ static struct iommu_gather_ops ipmmu_ga
        
        static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
        {
 -------        phys_addr_t ttbr;
 +++++++        u64 ttbr;
        
                /*
                 * Allocate the page table operations.