Re: linux-next: Tree for Nov 12

[Geert Uytterhoeven]

Hi Stephen,

On Wed, 12 Nov 2025 at 06:06, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Merging drm/drm-next (2a084f4ad727 Merge tag 'amd-drm-next-6.19-2025-11-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h

This file contains a duplicate definition of MAX_DIG_LINK_ENCODERS.
Please drop the second, cfr. the resolution in drm-tip.

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