dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Danilo Krummrich" <dakr@kernel.org>
To: "Dave Airlie" <airlied@gmail.com>
Cc: "Rodrigo Vivi" <rodrigo.vivi@intel.com>,
	"Simona Vetter" <simona@ffwll.ch>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"Jani Nikula" <jani.nikula@linux.intel.com>,
	"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
	"Tvrtko Ursulin" <tursulin@ursulin.net>,
	"Matthew Brost" <matthew.brost@intel.com>,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Alex Deucher" <alexander.deucher@amd.com>,
	"Christian König" <christian.koenig@amd.com>,
	dri-devel@lists.freedesktop.org,
	"Mark Brown" <broonie@kernel.org>,
	linux-next@vger.kernel.org
Subject: Re: [RFC] linux-next: replace the DRM trees with a single drm-for-linux-next
Date: Tue, 03 Nov 2026 20:32:48 +0100	[thread overview]
Message-ID: <DMLTRKUXTL3P.11VRVU1A8ERMG@kernel.org> (raw)
In-Reply-To: <CAPM=9tww=CJdxzvfUvLwQ6V4uoszg8JrB1XCAcp15upM-xPvSg@mail.gmail.com>

On Tue Nov 3, 2026 at 3:05 AM CET, Dave Airlie wrote:
> It might be time to pull back to -rc6 though, we could just keep the
> rust tree in -next separate,

Agreed, I think that makes sense (I am thinking more about occasional cases
where we may need a few days more due to cross-tree dependencies). Otherwise,
that's an option too, but I'd like to avoid a special case; if we take the
proposed approach, I'd rather try and see how it goes.

> It shouldn't cause any extra conflicts, but I'd rather not keep all
> the -next trees in -next once
> we merge this, otherwise we may end up with trees getting ahead of the
> next cycle again.

I'm not entirely sure what you mean by "keep all the -next trees in -next", but
just to clarify:

I'm proposing that linux-next only merge the unified tip/for-linux-next branch.
The per-tree for-linux-next branches would remain as inputs to that branch,
preserving their existing selection logic.

IOW, linux-next merges tip/for-linux-next, and tip/for-linux-next merges
$tree/for-linux-next, rather than $tree/$tree-next.

I.e. the ultimate source of what is linux-next material remains to be $tree.

In general, I think that this is more accurate and probably less error prone
(unless all trees really commit to tagging and sending their final -next PR at
the global cutoff).

For instance, let's say a tree closes (i.e. tags the last -next tag of the
cycle) a few days before -rc6, it could happen that subsequent commits to
$tree-next still appear in linux-next because tip still picks them up until
after -rc6. So, after -rc6 those commits (that were in linux-next for a few
days) would disappear from linux-next again.

Not that big of a deal, but technically they didn't even belong in linux-next
for only a few days.

If we kept $tree/for-linux-next, tip would never pick those commits up, because
a tree that closed a few days before -rc6 would already have switched
$tree/for-linux-next to $tree/$tree-next-fixes.

So, in the end, it comes down to whether each tree's closure controls what
enters linux-next, or whether maintainers need to coordinate their branch
updates around a single cutoff defined by tip. While the latter sounds like the
ideal case, I'm not entirely sure if it isn't too strict in practice. I'm
thinking more generally here, from a practical or organisational point of view.

(For instance, in practice Intel has sometimes sent its final -next PR a couple
of days before -rc6 and continued applying changes afterwards; I think their
cutoff is generally around -rc5/-rc6.)

> I'm not sure need to have that complexity for everyone, but if we need
> to keep the rust tree as an extra then I'm fine with that for now,
> until it stabilises.

Appreciate it, but I'd prefer not to special case it; I can see how my drm-rust
example focused the discussion on that case, whereas my concern is more general.

  reply	other threads:[~2026-11-03 19:33 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-02 18:41 [RFC] linux-next: replace the DRM trees with a single drm-for-linux-next Rodrigo Vivi
2026-11-02 18:51 ` Danilo Krummrich
2026-11-02 19:20   ` Rodrigo Vivi
2026-11-02 20:01     ` Danilo Krummrich
2026-11-03  2:05       ` Dave Airlie
2026-11-03 19:32         ` Danilo Krummrich [this message]
2026-11-03 20:33           ` Rodrigo Vivi
2026-11-03 21:04             ` Danilo Krummrich
2026-11-03 21:19               ` Alex Deucher
2026-11-03 22:48                 ` Rodrigo Vivi
2026-11-03 23:01                   ` Danilo Krummrich
2026-11-04  2:37                     ` Rodrigo Vivi
2026-11-04  3:29                       ` Dave Airlie
2026-11-04 11:08                         ` Danilo Krummrich
2026-11-04 17:44                           ` Rodrigo Vivi
2026-11-04 22:35                             ` Danilo Krummrich
2026-11-05 21:52                               ` Rodrigo Vivi
2026-11-05 23:27                                 ` Danilo Krummrich
2026-11-15 22:28                                   ` Danilo Krummrich
2026-11-05 13:44                         ` Jani Nikula
2026-11-05 21:08                           ` Danilo Krummrich
2026-11-06 11:08                             ` Jani Nikula
2026-11-06 12:10                               ` Mark Brown
2026-11-06 16:37                               ` Danilo Krummrich
2026-11-03 22:39               ` Rodrigo Vivi
2026-11-02 18:58 ` Mark Brown
2026-11-02 23:07 ` Alex Deucher
2026-11-03 20:35   ` Rodrigo Vivi
2026-11-03 21:24     ` Alex Deucher
2026-11-04  5:49 ` Thorsten Leemhuis
2026-11-04 11:48   ` Mark Brown
2026-11-04 12:46   ` Sasha Levin

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=DMLTRKUXTL3P.11VRVU1A8ERMG@kernel.org \
    --to=dakr@kernel.org \
    --cc=airlied@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=aliceryhl@google.com \
    --cc=broonie@kernel.org \
    --cc=christian.koenig@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=joonas.lahtinen@linux.intel.com \
    --cc=linux-next@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=matthew.brost@intel.com \
    --cc=mripard@kernel.org \
    --cc=rodrigo.vivi@intel.com \
    --cc=simona@ffwll.ch \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=tursulin@ursulin.net \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox