Re: linux-next: build failure after merge of the drm-xe tree
From: Mark Brown
Date: Mon Mar 16 2026 - 13:44:09 EST
On Fri, Mar 13, 2026 at 03:57:12PM +0200, Jani Nikula wrote:
> On Thu, 12 Mar 2026, Lionel Landwerlin <lionel.g.landwerlin@xxxxxxxxx> wrote:
> > Is there no process to deal with kind of merge issues quickly?
> For us the main part of the process is: If the patch doesn't build after
> applying, talk to the maintainers to get the merges and backmerges going
> *before* pushing, *not* after.
> Similar to linux-next, drm-tip is the early signal there's a
> conflict. If you develop on top of drm-tip, you'll find out about the
> conflicts when applying to the individual branches.
> I'll try to get a drm-intel-next pull request going today, or Monday at
> the latest. Lots of changelog to write. Then it's drm-intel-next ->
> drm-next -> drm-xe-next merges/backmerges that need to happen.
Any news on this? We now have issues with the main drm tree interacting
with drm-intel due to this change.
Attachment:
signature.asc
Description: PGP signature