Merge tag 'v5.2-rc6' into generic-dma-ops

Linux 5.2-rc6

diff --cc arch/arm64/mm/dma-mapping.c
index 1669618,5992eb9..9c588a1
--- 1/arch/arm64/mm/dma-mapping.c
--- 2/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@@ -1,5 -1,7 +1,5 @@@
- // SPDX-License-Identifier: GPL-2.0
+ // SPDX-License-Identifier: GPL-2.0-only
  /*
 - * SWIOTLB-based DMA API implementation
 - *
   * Copyright (C) 2012 ARM Ltd.
   * Author: Catalin Marinas <catalin.marinas@arm.com>
   */

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

diff --cc include/linux/dma-iommu.h
Simple merge