Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel

diff --cc drivers/gpu/drm/display/drm_dp_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/mmio.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_device_types.h
Simple merge

diff --cc include/drm/display/drm_dp_helper.h
Simple merge

diff --cc include/drm/display/drm_dp_mst_helper.h
Simple merge