From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id gIbOL5mDOmVQGQAAauVa8A:P1 (envelope-from ) for ; Thu, 26 Oct 2023 17:19:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id gIbOL5mDOmVQGQAAauVa8A (envelope-from ) for ; Thu, 26 Oct 2023 17:19:53 +0200 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 A6E0A33363 for ; Thu, 26 Oct 2023 17:19:53 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=p1uVHti1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none); 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=1698333593; a=rsa-sha256; cv=none; b=Dlz/MWkDm/opy+O1spe/UFsPw/BXf38/oWSU6NwfDhDow6osumaiaNVMYzEru5m74BVf/N LAW8KhNmRHo4YTjjumo4igSjgcPvyl+ulIaVNWzjab/5XjZzAl64HAh8Wtlsr+ZyccbQhh Daeiv1nw/3ZXmXOT/ZnD4w5bq37nlmsp/uNP9jx3C+rp5DLL9B+fR/t6/JIbq2msGzVw1E Q9fllCegSNTcd3e40id0mXUNeoO3s55abVZqTtzhpDIdFKo0SgV10YbahiXJ6t4a/LxxkI N5hB9CEnTk7Z0plqPEK1DCUt5QU++OHkFFfvoOaV0yrKnntqvZjjWhc7eUZ7Pg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wmeyer.eu header.s=mail header.b=p1uVHti1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=wmeyer.eu (policy=none); 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=1698333593; h=from:from:sender:sender: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=zfLCZhwC/DGLotsFJZy1t0I4ZWXzpgxIdc0MM455GHg=; b=PVJb77TdXYpY4XW4tiKm3hxXaSxrqFR1suDnNQeg9TFyINLs+Oi16D/aZxZKgwdqDs87yA qL04UiXLVFHkHoIs52Qz/Wtm4O/AhcwYf5ThdiL0bUhYTFH2cnMxkrqzt2eWcZeST5i4iZ HcKlgEvaVQjWPrTFJXlz6bwESPMY07kJl56fKoyMrDpXIPOW1Re8nswqhFe4aVE4ZjzPXx ZNG2ZgWe/canCHNKcF7P6IHOJwF+XzBu0auMj9Z8uO1KDEd1t/MQh12jjAJp7PbOczYqHS m1GP6uaMMlvXMRf8Rbzkr5Bb9EdquabhTJH+N4cBTK5QExeWFg2scdV3nhj3HA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qw290-0006Qh-IF; Thu, 26 Oct 2023 11:19:34 -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 1qw28y-0006QW-Kk for guix-patches@gnu.org; Thu, 26 Oct 2023 11:19:32 -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 1qw28y-0005gp-Cf for guix-patches@gnu.org; Thu, 26 Oct 2023 11:19:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qw29S-0002iS-QT for guix-patches@gnu.org; Thu, 26 Oct 2023 11:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66751] [PATCH 0/7] linux-libre kernel updates (2023-10-25) References: <20231025221136.12525-1-w@wmeyer.eu> In-Reply-To: <20231025221136.12525-1-w@wmeyer.eu> Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Oct 2023 15:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66751@debbugs.gnu.org Cc: leo@famulari.name Received: via spool by 66751-submit@debbugs.gnu.org id=B66751.169833360010426 (code B ref 66751); Thu, 26 Oct 2023 15:20:02 +0000 Received: (at 66751) by debbugs.gnu.org; 26 Oct 2023 15:20:00 +0000 Received: from localhost ([127.0.0.1]:34332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qw29Q-0002i6-7K for submit@debbugs.gnu.org; Thu, 26 Oct 2023 11:20:00 -0400 Received: from mail.wmeyer.eu ([95.216.196.112]:44096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qw29M-0002hm-2q for 66751@debbugs.gnu.org; Thu, 26 Oct 2023 11:19:58 -0400 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1698333558; bh=zfLCZhwC/DGLotsFJZy1t0I4ZWXzpgxIdc0MM455GHg=; h=From:To:Cc:Subject:Date; b=p1uVHti1IwjKjccJk+WVr/W8JNROen35ENyoZXz7jaOpDZexnSts88C71EDpdH28j K9j7S6CghVqWYrTN9zGSsJI6VYiZyKGBYwufRLOJ1gUS7MP8Pha0Dpc1rzfA77G6su q0Igea5pXlDnEdXFdzEEG3+g3fs21fqd0vw35ptQ= Date: Thu, 26 Oct 2023 17:06:47 +0200 Message-ID: <87fs1xwgwg.fsf@wmeyer.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , 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-Queue-Id: A6E0A33363 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.50 X-Spam-Score: -4.50 X-TUID: 5EYU/aU3ml9I Hi Leo, I noticed that our QA warns that a patch from this patch-series can't be applied to master: Applying: gnu: linux-libre 6.5: Update to 6.5.9. Using index info to reconstruct a base tree... M gnu/packages/linux.scm Falling back to patching base and 3-way merge... Auto-merging gnu/packages/linux.scm CONFLICT (content): Merge conflict in gnu/packages/linux.scm error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=3Ddiff' to see the failed patch Patch failed at 0001 gnu: linux-libre 6.5: Update to 6.5.9. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". but applying it to the kernel-updates branch works fine: (~/devel/guix) =CE=BB git am ../1=20 Applying: gnu: linux-libre 6.5: Update to 6.5.9. (~/devel/guix) =CE=BB git branch --show-current kernel-updates which is because the changes from https://issues.guix.gnu.org/66645 aren't on master yet as the QA over there still seems to be outstanding/not running and this patch series for some kernel versions diffs against the changes from #66645. We should probably apply this patch series to kernel-updates as well and see what QA says after it ran (I don't know too much about how our QA and CI jobs for the kernel-updates branch work, maybe we have to schedule/trigger them manually somehow?). WDYT? --=20 Kind regards, Wilko Meyer w@wmeyer.eu