Merge branch 'drm-next' of git://anongit.freedesktop.org/drm/drm into msm-next-lumag...

Merge the drm-next tree to pick up the DRM DSC helpers (merged via
drm-intel-next tree). MSM DSC v1.2 patches depend on these helpers.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --cc Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/display/msm/gmu.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

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

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

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

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