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

We need to backmerge drm-next to fix the komeda build failure.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 5d8471f080d9..fb67cd931117 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -242,7 +242,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,
         struct intel_connector *connector =
                 to_intel_connector(conn_state->connector);
         int ret;
-        uint32_t temp;
+        u32 temp;
 
         /* MST encoders are bound to a crtc, not to a connector,
          * force the mapping here for get_hw_state.