Merge drm/drm-next into drm-misc-next

drm-misc-next hasn't been updated in a while and I need a post -rc2
state to merge some vc4 patches.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

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

diff --cc drivers/gpu/drm/drm_modeset_lock.c
Simple merge

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

diff --cc include/drm/drm_connector.h
Simple merge

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

diff --cc include/linux/dma-resv.h
Simple merge