From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15019606A323 for ; Sun, 15 Nov 2026 22:28:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=gI5kQf1Z Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3567F10E0E3; Sun, 15 Nov 2026 22:28:50 +0000 (UTC) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3218610E0E3 for ; Sun, 15 Nov 2026 22:28:44 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id CA27E40A6A; Sun, 15 Nov 2026 22:28:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8068D1F000C5; Sun, 15 Nov 2026 22:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794781723; bh=eqS1kiyzjUYtpNhX1JXOAbWIfkJx9vqsPOZR2GyPQzs=; h=Date:Subject:Cc:To:From:References:In-Reply-To; b=gI5kQf1ZFI2CFDcOq61uRCQKqGNALCx+WRddx7DSOSqVygmvUvMpgA6SRbvy0EPeB kVVkPw6s+qdfiFg6GPQPoImRhmtR0Hp0S2X3eYqPq9Y0lvfZvt3dsayyz5tfdJEOmi tmmM2t5Zfv3hRmqLbwURaobFIdCoReF+riSrQfqZP7ilMEyggDyBmsC+M16xZ8Wf7e PgzYf9UXMsPUSyYXFTHCGId3MQ2uYhbRBEUwuFa0mIRr+ULvRr8ZH3mT3Q+sKN89QG JIOUO0rVevcNlEg4xVgFqLffOSEBQSlJ3ZMNunLnpSHIMTNgrMH7EX8rhHTGtHty9P SfH5bGjMB1cnA== X-Archived-By: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Sun, 15 Nov 2026 23:28:39 +0100 Message-Id: Subject: Re: [RFC] linux-next: replace the DRM trees with a single drm-for-linux-next Cc: "Dave Airlie" , "Alex Deucher" , "Simona Vetter" , "Maarten Lankhorst" , "Maxime Ripard" , "Thomas Zimmermann" , "Jani Nikula" , "Joonas Lahtinen" , "Tvrtko Ursulin" , "Matthew Brost" , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , "Alice Ryhl" , "Alex Deucher" , =?utf-8?q?Christian_K=C3=B6nig?= , , "Mark Brown" , To: "Rodrigo Vivi" From: "Danilo Krummrich" References: In-Reply-To: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "dri-devel" X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 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-f= ixes. 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 me= rge, 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 t= he 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 en= tries and before -next/topic branches (keeping the existing entries). Trees can migrate individually; coordination with the linux-next maintainer= s 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 ap= ply 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 bra= nch. Besides that, the code already exists in dim.) [1] https://gitlab.freedesktop.org/drm/maintainer-tools/-/merge_requests/11= 5