On Mon, Oct 19, 2026 at 12:09:59PM -0700, Devin Wittmayer wrote: > On Mon, Oct 19, 2026 at 05:10:46PM +0100, Mark Brown wrote: > > This obviously isn't the right merge, it drops the fixes.
> Two of those fixes are mine, so I had a go at it. The code that draws > the panic screen was moved into drm_panic_helper.c in drm-next, so two of > the three need to move with it. The third one, for the panic screen > setting, made it through your merge fine. Today's drm-tip has the same > gap. Yes, quite - the move causes issues with tracking conflict resolutions unfortunately since it doesn't show up at all to git's idea of a conflict.
signature.asc
Description: PGP signature
