From: Mark Brown <broonie@kernel.org>
To: Devin Wittmayer <lucid_duck@justthetip.ca>
Cc: Dave Airlie <airlied@redhat.com>,
DRI <dri-devel@lists.freedesktop.org>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Jocelyn Falempe <jfalempe@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
luyuantao <luyuantao@kylinos.cn>,
Simona Vetter <simona.vetter@ffwll.ch>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree
Date: Tue, 20 Oct 2026 10:52:41 +0100 [thread overview]
Message-ID: <atc56cq8Vhz_2M_o@sirena.co.uk> (raw)
In-Reply-To: <20261019190959.799653-1-lucid_duck@justthetip.ca>
[-- Attachment #1: Type: text/plain, Size: 635 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-10-20 9:52 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 16:10 linux-next: manual merge of the drm tree with the drm-misc-fixes tree Mark Brown
2026-10-19 19:09 ` Devin Wittmayer
2026-10-20 9:52 ` Mark Brown [this message]
2026-10-20 7:30 ` Jocelyn Falempe
2026-10-20 12:59 ` ✗ LGCI.VerificationFailed: failure for linux-next: manual merge of the drm tree with the drm-misc-fixes tree (rev2) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2026-09-28 14:15 linux-next: manual merge of the drm tree with the drm-misc-fixes tree Mark Brown
2026-09-18 11:14 Mark Brown
2026-09-18 11:14 Mark Brown
2026-08-12 15:45 Mark Brown
2026-08-12 12:20 Mark Brown
2026-06-11 13:54 Mark Brown
2026-06-16 9:16 ` Geert Uytterhoeven
2026-03-20 14:17 Mark Brown
2026-03-20 15:39 ` Boris Brezillon
2026-04-08 17:26 ` Mark Brown
2026-04-09 7:47 ` Boris Brezillon
2026-03-18 14:36 Mark Brown
2026-03-18 15:49 ` Luca Ceresoli
2026-03-18 18:20 ` Cristian Ciocaltea
2026-01-05 2:21 Stephen Rothwell
2025-08-20 1:21 Stephen Rothwell
2025-08-20 10:30 ` Danilo Krummrich
2025-08-20 21:29 ` Stephen Rothwell
2025-07-18 4:41 Stephen Rothwell
2025-07-18 6:27 ` Thomas Zimmermann
2025-01-14 1:30 Stephen Rothwell
2023-11-22 0:29 Stephen Rothwell
2023-11-22 0:29 ` Stephen Rothwell
2023-11-28 10:04 ` Geert Uytterhoeven
2023-11-28 10:04 ` Geert Uytterhoeven
2023-09-28 2:05 Stephen Rothwell
2023-09-28 2:05 ` Stephen Rothwell
2023-06-27 1:54 Stephen Rothwell
2023-06-27 1:54 ` Stephen Rothwell
2023-07-11 1:17 ` Stephen Rothwell
2023-07-11 1:17 ` Stephen Rothwell
2022-11-21 2:06 Stephen Rothwell
2022-11-21 2:06 ` Stephen Rothwell
2022-07-11 2:47 Stephen Rothwell
2022-07-11 2:47 ` Stephen Rothwell
2022-07-11 8:05 ` Christian König
2022-07-11 8:05 ` Christian König
2022-07-17 23:44 ` Stephen Rothwell
2022-07-17 23:44 ` Stephen Rothwell
2022-07-19 7:35 ` Geert Uytterhoeven
2022-07-19 7:35 ` Geert Uytterhoeven
2022-07-27 2:55 ` Stephen Rothwell
2022-07-27 2:55 ` Stephen Rothwell
2022-07-27 3:24 ` Dave Airlie
2022-07-27 3:24 ` Dave Airlie
2022-07-27 5:37 ` Stephen Rothwell
2022-07-27 5:37 ` Stephen Rothwell
2022-03-18 0:55 Stephen Rothwell
2022-03-18 0:55 ` Stephen Rothwell
2022-03-18 1:06 ` Stephen Rothwell
2022-03-18 1:06 ` Stephen Rothwell
2021-12-22 3:50 Stephen Rothwell
2021-12-22 3:50 ` Stephen Rothwell
2021-12-22 7:31 ` Christian König
2021-12-22 7:31 ` Christian König
2021-11-29 23:33 Stephen Rothwell
2021-11-29 23:33 ` Stephen Rothwell
2021-11-30 8:58 ` Maxime Ripard
2021-11-30 8:58 ` Maxime Ripard
2021-11-30 20:35 ` Stephen Rothwell
2021-11-30 20:35 ` Stephen Rothwell
2021-10-22 0:53 Stephen Rothwell
2021-06-17 1:42 Stephen Rothwell
2021-06-17 1:42 ` Stephen Rothwell
2021-04-09 3:12 Stephen Rothwell
2021-04-09 3:12 ` Stephen Rothwell
2021-03-18 1:02 Stephen Rothwell
2021-03-18 1:02 ` Stephen Rothwell
2021-03-18 6:51 ` Tomi Valkeinen
2021-03-18 6:51 ` Tomi Valkeinen
2020-07-28 3:41 Stephen Rothwell
2020-07-28 3:41 ` Stephen Rothwell
2020-05-01 3:45 Stephen Rothwell
2020-05-01 3:45 ` Stephen Rothwell
2020-03-01 23:43 Stephen Rothwell
2020-03-01 23:43 ` Stephen Rothwell
2019-09-15 21:18 Mark Brown
2019-09-16 5:29 ` Vasily Khoruzhick
2019-09-17 2:43 ` Qiang Yu
2019-08-26 3:06 Stephen Rothwell
2019-08-29 10:11 ` james qian wang (Arm Technology China)
2019-08-29 10:11 ` james qian wang (Arm Technology China)
2018-11-26 2:37 Stephen Rothwell
2018-03-08 0:47 Stephen Rothwell
2017-12-13 23:59 Stephen Rothwell
2017-12-13 23:59 ` Stephen Rothwell
2017-01-17 0:59 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=atc56cq8Vhz_2M_o@sirena.co.uk \
--to=broonie@kernel.org \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jfalempe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucid_duck@justthetip.ca \
--cc=luyuantao@kylinos.cn \
--cc=simona.vetter@ffwll.ch \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.