All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Danilo Krummrich" <dakr@kernel.org>
To: "Rodrigo Vivi" <rodrigo.vivi@intel.com>
Cc: "Dave Airlie" <airlied@gmail.com>,
	"Alex Deucher" <alexdeucher@gmail.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: Sun, 15 Nov 2026 23:28:39 +0100	[thread overview]
Message-ID: <DMW50R7OLMBC.2937FMZK59SIH@kernel.org> (raw)
In-Reply-To: <DMNO09PAED4M.34GSWNA0Q55E1@kernel.org>

On Fri Nov 6, 2026 at 12:27 AM CET, Danilo Krummrich wrote:
> Sure, I'm happy to look into this.

This is now implemented in [1]; here's a brief summary of how it works.

Currently, for each tree that already has a for-linux-next branch,
$tree/for-linux-next points to $tree/$tree-next when $tree/$tree-next-fixes is
an ancestor of $tree/$tree-fixes. Otherwise it points to $tree/$tree-next-fixes.
This is the existing selection rule in dim; with my changes, drm-for-linux-next
follows the same logic.

The merge order dim applies for drm-tip is:

  1. All -fixes branches, then drm-next.
  2. All per-tree -next-fixes branches.
  3. The configured per-tree for-linux-next branches.
  4. Record drm-for-linux-next.
  5. Merge the remaining -next and topic branches to complete drm-tip.

Of course we could easily avoid either the explicit -next or -next-fixes merge,
depending on which of the two for-linux-next is equal to, but keeping it
explicit is harmless and keeps things simple for branch-specific overrides.

dim pull-request, which wraps git request-pull, now asks:

	Close this tree for the upcoming merge window? (y/N)

Answering yes fast-forwards -next-fixes to the requested tag, updates
for-linux-next and rebuilds tip. --close-tree and --keep-tree-open bypass the
prompt. For trees still open, dim normally prompts during -rc4 through -rc7,
inclusive.

To enable your tree for integration through drm-for-linux-next, add "$tree
for-linux-next" to drm_tip_config in nightly.conf, after all -next-fixes entries
and before -next/topic branches (keeping the existing entries).

Trees can migrate individually; coordination with the linux-next maintainers to
replace each tree's separate inclusions can be done once the corresponding tree
is covered by drm-for-linux-next and drm-for-linux-next is merged by linux-next.

(Note: dim technically doesn't need an explicit for-linux-next branch to apply
this logic. However, I did kinda like that it gives maintainers an explicit
branch to indicate what exactly goes into linux-next besides the -fixes branch.
Besides that, the code already exists in dim.)

[1] https://gitlab.freedesktop.org/drm/maintainer-tools/-/merge_requests/115

  reply	other threads:[~2026-11-15 22:28 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
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 [this message]
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=DMW50R7OLMBC.2937FMZK59SIH@kernel.org \
    --to=dakr@kernel.org \
    --cc=airlied@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=alexdeucher@gmail.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 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.