Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp',...

diff --cc drivers/gpu/drm/msm/Makefile
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_parser.h
Simple merge

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

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

diff --cc drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
Simple merge

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

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

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