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

[Helge Deller <deller@xxxxxx>]

On 9/24/24 03:16, Stephen Rothwell wrote:
> Today's linux-next merge of the fbdev tree got a conflict in:
>
>    drivers/video/fbdev/core/fbcon.c
>
> between commits:
>
>    d20a9f568f99 ("fbcon: Add an option to disable fbcon in panic")
>    1c1ed27ee117 ("fbcon: Use oops_in_progress instead of panic_cpu")

fixed in fbdev git tree now.

Thanks!
Helge