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

Backmerging to get the latest fixes from drm-next; specifically the
build fix from the patchset at [1]. Also fixes the build by removing
an unused variable from rzg2l_du_vsp_atomic_flush().

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/series/130720/

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
index 0ae6331d6430f381b9ea4445137cbb61d64939e1,0ae6331d6430f381b9ea4445137cbb61d64939e1..8643ff2eec46ef7bc72a438d74ccc263626f7d8b
--- 1/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
--- 2/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
+++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c
@@@ -66,9 -66,9 +66,6 @@@ void rzg2l_du_vsp_disable(struct rzg2l_
  void rzg2l_du_vsp_atomic_flush(struct rzg2l_du_crtc *crtc)
  {
        struct vsp1_du_atomic_pipe_config cfg = { { 0, } };
--      struct rzg2l_du_crtc_state *state;
--
--      state = to_rzg2l_crtc_state(crtc->crtc.state);
  
        vsp1_du_atomic_flush(crtc->vsp->vsp, crtc->vsp_pipe, &cfg);
  }