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

Thomas Zimmermann
2025-12-04T07:35:59Z

Hi, your fix looks correct.

Am 04.12.25 um 04:06 schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/drm_fb_helper.c
>
> between commit:
>
> eb76d0f55535 ("drm, fbcon, vga_switcheroo: Avoid race condition in fbcon setup")
>
> from Linus' tree and commit:
>
> 6915190a50e8 ("drm/client: Support emergency restore via sysrq for all clients")
>
> 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.
>

--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)