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

From: Helge Deller
Date: Tue Sep 24 2024 - 04:30:08 EST

Next message: Qi Zheng: "Re: [PATCH v4 10/13] mm: page_vma_mapped_walk: map_pte() use pte_offset_map_rw_nolock()"
Previous message: Simona Vetter: "Re: [PATCH v2 0/5] Add support for GE SUNH hot-pluggable connector (was: "drm: add support for hot-pluggable bridges")"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Next message: Qi Zheng: "Re: [PATCH v4 10/13] mm: page_vma_mapped_walk: map_pte() use pte_offset_map_rw_nolock()"
Previous message: Simona Vetter: "Re: [PATCH v2 0/5] Add support for GE SUNH hot-pluggable connector (was: "drm: add support for hot-pluggable bridges")"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]