From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kEGOE/le/mZGSAEA62LTzQ:P1 (envelope-from ) for ; Thu, 03 Oct 2024 09:08:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kEGOE/le/mZGSAEA62LTzQ (envelope-from ) for ; Thu, 03 Oct 2024 11:08:09 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bOAyuWDx; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b=5KSSWtcH; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727946489; a=rsa-sha256; cv=none; b=cEUJseU3/QAfiJ6aTQ6rVtUsJ3h44+jCl+wQLQKP9PfAMt6gnmUE6idI2RbOFjxUWBDTIw z74ZZ+qGPlj85KePE3LjMLXXhPVGrX3e8/wj9SRJm5Xr15dm8bUVoBzEyI6CtkACplJ0OZ g8+TAYTb6/0akY4Wc/6A4Mx7fom7zvg+7M5r8LMlSBEXK1zY0dr+OQbNZI/6o4QgAdW5pE D1o/n3x7eiHm2l/tgKbQUA3zbH5EoI2/MQUaHu53YDyMDlU05wMegEBPsyjECKct89Yowu dJS+ZALl6YypSxKXLpkP8W3Djyl6xWZCFX3alJdW0wKkfHz5IQGDt9N5+mDUoA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=bOAyuWDx; dkim=fail ("headers rsa verify failed") header.d=futurile.net header.s=selector1 header.b=5KSSWtcH; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727946489; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wAlFPWsQ3DRqrS2/rWJ3AYk+zBomFfFO8fY/q5AcJx4=; b=KAlMICtLCCO/AoBJgxiqE3KIzmVSCY+J/9FCQpYBj+oNRC9PGRE4UaCufPoIscabJoA4I+ Mefuf0cce8Tjq/FUzIYoboH1jIcFiHIHT/b6LUz4EXx8T2JWl0txYwGze0SWK0N0zRD7UX lAQVfGIqAuBatqh0D8JCEhs0LC9RwWMD3qUITFSErAdq76wBqu7BX+h0dyj1W86MnQjSRM /PoAHVGq0yc176HTwTTK2itNqM5rkuSjQJVUt+Soxl/t4v9dkoc9nBEZ13RaXzkMwwMi9A 3wAm2vbwfWD0YvWG9tiaMBPAlEkdaxMeiaewvr2oTUuDIxfdnqYWbMKJvqVV+w== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EC9A1185BA for ; Thu, 03 Oct 2024 11:08:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1swHnM-0002sG-QO; Thu, 03 Oct 2024 05:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1swHkA-0002CL-Bj for guix-patches@gnu.org; Thu, 03 Oct 2024 05:06:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1swHk5-0003uv-Fg for guix-patches@gnu.org; Thu, 03 Oct 2024 05:03:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:From:References:MIME-Version:Date:To:Subject; bh=wAlFPWsQ3DRqrS2/rWJ3AYk+zBomFfFO8fY/q5AcJx4=; b=bOAyuWDxhC7u9PWB7COpHtfmJMyqwBMA9Rpb5wLCgq+gsT/+eA2nSJb94/B+fbgjJdITFN61ZxgFQ5j+jbUVc9hQZKlrdRaXXl+NXqPvnh23JR/eDjYC4RKFTSOwOVzx9a+IOYwkD0HQHMEgM8f6pK6LXurPf92at/sBJ4k5TsxzKvUkGRfBthiH3P81IAaKHEp0iL71m5ero2S+rHcwVXaZXccRAU5uvzqmf6WnQO2/iarlMgYbxoDhLpsiLu4E4adalOzz8BMMYxRzJMrSfMwxoD3lc6swsjCsLK2qjR+gRPTxh5cQGxMsb86cJvODS/HjfSRIy+tKhsYJW6yvGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1swHji-0006lr-0S for guix-patches@gnu.org; Thu, 03 Oct 2024 05:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73288] Request for merging "mesa-updates" branch Resent-From: Steve George Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Oct 2024 09:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73288 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Sharlatan Hellseher , 73288@debbugs.gnu.org Cc: john.kehayias@protonmail.com, ludo@gnu.org Received: via spool by 73288-submit@debbugs.gnu.org id=B73288.172794616826003 (code B ref 73288); Thu, 03 Oct 2024 09:03:01 +0000 Received: (at 73288) by debbugs.gnu.org; 3 Oct 2024 09:02:48 +0000 Received: from localhost ([127.0.0.1]:59987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swHjL-0006l9-7l for submit@debbugs.gnu.org; Thu, 03 Oct 2024 05:02:48 -0400 Received: from mailtransmit05.runbox.com ([185.226.149.38]:60574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swHj7-0006kg-Od for 73288@debbugs.gnu.org; Thu, 03 Oct 2024 05:02:36 -0400 Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1swHis-00037p-QP; Thu, 03 Oct 2024 11:02:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID; bh=wAlFPWsQ3DRqrS2/rWJ3AYk+zBomFfFO8fY/q5AcJx4=; b=5KSSWtcHgbERM2Gq0tbvu/Yp7+ 5c2ndwuZMYOvIdj0G7BZ9jSCQI5G2flbi1kEpPz+YCl7hBAzaT636IqF2SXelXpUgV/N0HZLCjdje CctEBCm4q6mVJ1pw9Tay6HlvJJeELjLj130Z6bR3/wm+bmE9wv/ABpSkmGv1j5jL2b/d56rUq4O9l bpc/PpVDeCcRsKxXwZfMamLS6PVtcxynRJam2jqHuuCpINRzPpj92x2vGtqWJyaExQEw3mbVNCWYi PHoBsH0/0A69EGCyjzy51SlakmnxDWwezKDpAorgTB3/vyfz09PVJxwqN8zEaFn0rrnKvh9VIlC6K IstA7bsw==; Received: from [10.9.9.74] (helo=submission03.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1swHir-0002sb-D1; Thu, 03 Oct 2024 11:02:09 +0200 Received: by submission03.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1swHiW-0007dy-GW; Thu, 03 Oct 2024 11:01:48 +0200 Message-ID: Date: Thu, 3 Oct 2024 10:01:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird References: <87cyki6xbi.fsf@gmail.com> Content-Language: en-US In-Reply-To: <87cyki6xbi.fsf@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Steve George via Guix-patches Reply-To: Steve George Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.42 X-Spam-Score: 0.42 X-Migadu-Queue-Id: EC9A1185BA X-Migadu-Scanner: mx12.migadu.com X-TUID: bBcqyAO/e9g5 On 02/10/2024 21:53, Sharlatan Hellseher wrote: > > Hi, > > The current queue of branches awaiting for review and merge: > > | 71408 | python-team | Fri Jun 07 10:55:25+0200 2024 | Done | > | 72959 | fonts-split-outputs | Mon Sep 02 12:55:25+0200 2024 | Open | > | 73104 | r-team | Sat Sep 07 17:55:24+0200 2024 | Open | > | 73288 | mesa-updates | Mon Sep 16 04:38:25+0200 2024 | Open | > | 73502 | go-team | Thu Sep 26 23:40:25+0200 2024 | Open | > | 73515 | qt-team | Fri Sep 27 14:46:24+0200 2024 | Open | > | 73558 | wip-gsl-upgrade | Sun Sep 29 22:33:24+0200 2024 | Open | > | 73567 | lisp-team | Mon Sep 30 15:43:28+0200 2024 | Open | > > - https://qa.guix.gnu.org/branch/python-team > #71408 It was closed due to a large amount of merge conflicts which > can't be resolved quick enough not blocking other changes (CC Steve who > started cherry pick process) > There are 231 commits ahead of master. I propose to break this into groups of 30-50 commits at a time. Excluding the build-system changes that Lars [0] said they would do. Rebase on current master and test that they don't make master 'worse' [1] Each 30-50 can be put into a new branch for a smaller 'merge-train', to see if it makes merging faster overall. I did the first 31 and tested them. A new branch and merge-request could be created for them [2]. I need someone to collaborate with as I can't do that myself. However, looks like everyone in python-team is busy atm. I'll cherry-pick the next tranche if someone has the time to work with me on merging them - otherwise I'm wasting my time :-) Steve / Futurile [0] https://issues.guix.gnu.org/71408#8 [1] no additional breakage, though there are quite a few broken packages [2] https://issues.guix.gnu.org/71408#13