Hi all, After merging the amdgpu tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_atomic_check': drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9706:41: error: redeclaration of 'mgr' with no linkage 9706 | struct drm_dp_mst_topology_mgr *mgr; | ^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9697:41: note: previous declaration of 'mgr' with type 'struct drm_dp_mst_topology_mgr *' 9697 | struct drm_dp_mst_topology_mgr *mgr; | ^~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9707:43: error: redeclaration of 'mst_state' with no linkage 9707 | struct drm_dp_mst_topology_state *mst_state; | ^~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:9698:43: note: previous declaration of 'mst_state' with type 'struct drm_dp_mst_topology_state *' 9698 | struct drm_dp_mst_topology_state *mst_state; | ^~~~~~~~~ Caused by commit c689e1e362ea ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments") interacting with commits 1119e1f9636b ("drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments") f439a959dcfb ("amdgpu: fix build on non-DCN platforms.") from Linus' tree. Please can you guys think about your bug fixing process? I have applied the following merge fix for today: From: Stephen Rothwell Date: Mon, 30 Jan 2023 12:12:21 +1100 Subject: [PATCH] amdgpu: fix up for "drm/amdgpu/display/mst: Fix mst_state->pbn_div and slot count assignments" This appears as a commit in Linus tree and again in the amdgpu tree, but there is a following fix commit in Linus' tree. Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 8965071f595b..e1d63826927a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -9694,8 +9694,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, struct drm_connector_state *old_con_state, *new_con_state; struct drm_crtc *crtc; struct drm_crtc_state *old_crtc_state, *new_crtc_state; - struct drm_dp_mst_topology_mgr *mgr; - struct drm_dp_mst_topology_state *mst_state; struct drm_plane *plane; struct drm_plane_state *old_plane_state, *new_plane_state; enum dc_status status; -- 2.35.1 -- Cheers, Stephen Rothwell