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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <b5b2a18a-f05e-4510-9c58-0efc90277604@gmx.de>
Date: Tue, 24 Sep 2024 10:29:49 +0200
From: Helge Deller <deller@....de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jocelyn Falempe <jfalempe@...hat.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Ville Syrjälä <ville.syrjala@...ux.intel.com>
Subject: Re: linux-next: manual merge of the fbdev tree with Linus' tree

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