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 via email to