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

[Geert Uytterhoeven]

Hi Mark,

On Thu, 11 Jun 2026 at 15:59, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
>   drivers/gpu/drm/drm_atomic.c
>   include/drm/drm_colorop.h
>
> between commit:
>
>   94ff735296d371 ("drm/colorop: make lut(1/3)d_interpolation props correctly behave as mutable")
>
> from the drm-misc-fixes tree and commits:
>
>   5164f7e7ff8ec7 ("drm: Rename struct drm_atomic_state to drm_atomic_commit")
>   0c44d8dc6df988 ("drm/atomic: prefer drm_printf_indent() over inline \t")
>
> from the drm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

You forgot to include the fix, but I can confirm the fix in linux-next
LGTM.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds