On Tue, 15 Sep 2026 12:12:51 +0200, Maxime Ripard wrote:
> Commit 2bcec01cf105 ("drm/amdgpu_dm: Convert to atomic_create_state")
> converted dm_test_plane_create_state_initializes_state() to call
> amdgpu_dm_plane_drm_plane_create_state(), which returns a struct
> drm_plane_state pointer stored in a new plane_state variable.
> 
> However, the merge conflict resolution kept the old declaration
> (struct dm_plane_state *old_state) instead of replacing it with
> struct drm_plane_state *plane_state, leaving an unused variable with
> the wrong type.
> 
> [...]

Applied to misc/kernel.git (drm-misc-next)

[1/1] drm/amdgpu_dm: tests: Fix wrong variable declaration after merge conflict
      commit: 87882cd6debd94a14c65894e9220be8a01b5d4fa

Thanks!
Maxime

Reply via email to