Merge tag 'v5.7-rc4' into core

Linux 5.7-rc4

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

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

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