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

[Mark Brown]

On Fri, Jul 17, 2026 at 03:40:07PM +0100, Mark Brown wrote:

> Today's linux-next merge of the drm tree got a conflict in:
> 
>   drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c
> 
> between commits:
> 
>   6351003b1f4ec ("drm/amd/display: wire DCN42B mcache programming callback")
>   57cf172be2827 ("drm/amd/display: fix dcn42b det allocation order")
>   c4bc7ffb91586 ("drm/amd/display: Fix DCN42B null registers & register masks")
> 
> from the drm-fixes tree and commits:
> 
>   85453fb4ff726 ("drm/amd/display: wire DCN42B mcache programming callback")

Actually the merge here doesn't build.  I'll try to fix it up but
*please* try not to do this constant, routine cherry picking.  Sometimes
it's the sensible thing to do but most of the time I'd expect to see the
fixes go up onto the -next branch with a merge.

Attachment: signature.asc
Description: PGP signature