Re: linux-next: manual merge of the amdgpu tree with the drm-misc tree

[Mark Brown]

On Tue, Sep 08, 2026 at 05:34:48PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the amdgpu tree got a conflict in:
> 
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> 

> diff --combined drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> index e7b555fa666fb,57c6b32b95167..0000000000000
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c

The merge here is wrong, and there's more extensive conflicts including

/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:2962:1: error: conflicting types for 'fill_dc_plane_info_and_addr'
 2962 | fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
      | ^
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.h:1262:5: note: previous declaration is here
 1262 | int fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
      |     ^

I'll get something that builds but no idea if it'll work.

Attachment: signature.asc
Description: PGP signature