From: Jani Nikula <jani.nikula@intel.com>
To: Lionel Landwerlin <lionel.g.landwerlin@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
"Souza, Jose" <jose.souza@intel.com>
Cc: "broonie@kernel.org" <broonie@kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm-xe tree
Date: Fri, 13 Mar 2026 15:57:12 +0200 [thread overview]
Message-ID: <690dbd675c4b704844decd077a424de68099dee5@intel.com> (raw)
In-Reply-To: <7df1c2dd-1e62-4cc6-9fb8-9f4ac160077f@intel.com>
On Thu, 12 Mar 2026, Lionel Landwerlin <lionel.g.landwerlin@intel.com> 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.
BR,
Jani.
--
Jani Nikula, Intel
next prev parent reply other threads:[~2026-03-13 13:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-11 13:08 linux-next: build failure after merge of the drm-xe tree Mark Brown
2026-03-11 17:16 ` Souza, Jose
2026-03-11 18:10 ` Rodrigo Vivi
2026-03-11 18:16 ` Souza, Jose
2026-03-11 20:11 ` Rodrigo Vivi
2026-03-12 7:47 ` Lionel Landwerlin
2026-03-12 11:43 ` Mark Brown
2026-03-13 0:50 ` Rodrigo Vivi
2026-03-13 1:18 ` Souza, Jose
2026-03-13 13:25 ` Mark Brown
2026-03-13 0:46 ` Rodrigo Vivi
2026-03-13 13:57 ` Jani Nikula [this message]
2026-03-16 17:38 ` Mark Brown
2026-03-19 8:59 ` Jani Nikula
2026-03-19 9:00 ` Jani Nikula
-- strict thread matches above, loose matches on Subject: below --
2025-03-07 2:21 Stephen Rothwell
2025-03-11 2:15 ` Stephen Rothwell
2025-03-07 1:58 Stephen Rothwell
2025-03-11 2:13 ` Stephen Rothwell
2024-12-04 13:36 Mark Brown
2024-12-04 13:46 ` Jani Nikula
2024-12-04 14:18 ` Mark Brown
2024-10-01 1:38 Stephen Rothwell
2024-02-22 8:04 Stephen Rothwell
2024-02-22 17:09 ` Lucas De Marchi
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=690dbd675c4b704844decd077a424de68099dee5@intel.com \
--to=jani.nikula@intel.com \
--cc=broonie@kernel.org \
--cc=jose.souza@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lionel.g.landwerlin@intel.com \
--cc=rodrigo.vivi@intel.com \
/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.