Merge remote-tracking branch 'drm/drm-next' into msm-next

Back-merge drm-next to (indirectly) get arm-smmu updates for making
stall-on-fault more reliable.

Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --cc drivers/gpu/drm/msm/msm_gem_submit.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gpu.c
Simple merge