From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id QPT8GVnC+mP65AAAbAwnHQ (envelope-from ) for ; Sun, 26 Feb 2023 03:22:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8HcLGVnC+mM4vQAAG6o9tA (envelope-from ) for ; Sun, 26 Feb 2023 03:22:17 +0100 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 E00EB150CB for ; Sun, 26 Feb 2023 03:22:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pW6fs-0002VH-2P; Sat, 25 Feb 2023 21:22:04 -0500 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 1pW6fq-0002Ut-5m for bug-guix@gnu.org; Sat, 25 Feb 2023 21:22:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pW6fp-0002Fh-Te for bug-guix@gnu.org; Sat, 25 Feb 2023 21:22:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pW6fp-0001Mo-P6 for bug-guix@gnu.org; Sat, 25 Feb 2023 21:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#61798: infodoc patch doesn't apply to linux 6.2 Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 26 Feb 2023 02:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61798 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 61798@debbugs.gnu.org X-Debbugs-Original-Cc: bug-guix@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16773781135236 (code B ref -1); Sun, 26 Feb 2023 02:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Feb 2023 02:21:53 +0000 Received: from localhost ([127.0.0.1]:41998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW6fh-0001MO-DI for submit@debbugs.gnu.org; Sat, 25 Feb 2023 21:21:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:43056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW6fe-0001MF-Pk for submit@debbugs.gnu.org; Sat, 25 Feb 2023 21:21:51 -0500 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 1pW6fe-0002UR-CY for bug-guix@gnu.org; Sat, 25 Feb 2023 21:21:50 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pW6fc-00027x-OC for bug-guix@gnu.org; Sat, 25 Feb 2023 21:21:50 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 36ECA5C0082; Sat, 25 Feb 2023 21:21:46 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 25 Feb 2023 21:21:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=mesmtp; t=1677378106; x=1677464506; bh=Vy6youv/6PJmkOJS8brUBT9T4W4rIE7+jzDEtPWEt04=; b=vDnvZI5kZs8s YxZMa4geOyBPRVWdu+Li4l8IEy8jAo2GIrmVA8sEQvkiIK29bkzYWHGsbhSSFEBN Lh2ibzQFvGIumpnVLHP194ZfHOxGAOhIh6cqent03PP+ro9jWe8j1Jl1J/ok2Rpm IpTl+e0APj1Jj9toYC9m1jJgdgNVVM8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1677378106; x=1677464506; bh=Vy6youv/6PJmkOJS8brUBT9T4W4r IE7+jzDEtPWEt04=; b=TGxXfcFlLEurHlIZJN8LNQ/98cP/RWbvPsiIE7juRGoO 65xswDqfHyvrn2S+lwX9N/0bwZ43WjaBVvHiuWdETF6e2Eoogm7Gc4sQqR4YZpMe uEY4SZnWT5kWEfivHL3EjSwSihB5kIBaRl5hf1lmQ/M0gGHu37ovBrHcolJu88O/ CbiuB8Bi/HIgcqhTNqDljSHiddAgK+90oCCNXGhtXuEEdZZMY9bjAOPJ5X++7by0 IXUwQR5smGc3Y8ua0wm1fVpv+bhq3rGKW6sZ9brg6vw7RRzqeYnUs87zjfPsivcj D22nWPuG72qQLMHUPdIJqP9gBNICgPv+5Cq09lEYwA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudekjedggedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepteehuedviedvleeuueekhfdtieehtdeghfdvvdelhfdujeduieehleefveet uefhnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 25 Feb 2023 21:21:45 -0500 (EST) Date: Sat, 25 Feb 2023 21:21:19 -0500 From: Leo Famulari Message-ID: References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221116165551.23244-1-maxim.cournoyer@gmail.com> Received-SPF: pass client-ip=66.111.4.27; envelope-from=leo@famulari.name; helo=out3-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677378137; a=rsa-sha256; cv=none; b=BelppMfgoBf49moWI6QqXSl0ZgcwNS+IacsDBe8aADiCuzDisBLC2IdaVg6NkYte3AAM40 W+DOOQhnotg4p2kVQOEoLXpfTic2x09Hhm7aYXTz0R+Kth+stFWdod5hiHDIfk+yOBpmf9 8dJHBC1CcC8dU7ETewo6Arj3PIhx+FvjyI/ev+7pgC/76JyGqSMVAziSB/0S2de9/57O1r Ox0AQZCqwxcpx6X8DULa+sY9gLUp6FsQMRdBzQg5LBlrEdQogM6yjzKbxzg5nSVTllThw8 PfgHuKrMWc0ibEfeeOU4kyP7qmbCbKUjLqwTSuHpqDk9dlauh0+P/pn8Y9dNFA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=vDnvZI5k; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=TGxXfcFl; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677378137; 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: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=Vy6youv/6PJmkOJS8brUBT9T4W4rIE7+jzDEtPWEt04=; b=rqzbh1PvXQiQBdS5VcByrd8NrnT45zULTnd6cO3UeQxbgyJY7tCM5UnbmIjOZamm8t5/ae Aa6uNFn0RSvgVXtKw5ckNkUrl51W1DZee1c8QbIT9nsgM7tZzig/I8k0z1aPIXV35bcbSj 3gqsBMwVHzvCHxYWVpN7uM4p/kiQkfu6HaBbNGua4/TKJ/2qLSbKdzqSgPJIUzYCQii5MR USHZl6dW8A847Ch6P2jGQTEc3GlbP7xsyUzI0wPZR9Sj/ob+mryHTIyUaTGrKk4nkHqC1N ZPKr0hE52DvuBeriUxsOy/WUgqhtlwotcOBMSnz1BFyyCG6KY5YJP1lCkd1uvg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.48 X-Spam-Score: -2.48 X-Migadu-Queue-Id: E00EB150CB Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=vDnvZI5k; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=TGxXfcFl; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: VBKZfCfEAwU2 On Wed, Nov 16, 2022 at 11:55:51AM -0500, Maxim Cournoyer wrote: > .../patches/linux-libre-infodocs-target.patch | 88 ++++++ This patch doesn't apply to linux-libre 6.2.1, as shown below. If I understand correctly, it's been applied upstream, but I don't understand how to adjust things on our end. Can you take a look and send a patch that applies on top of #61770? https://issues.guix.gnu.org/issue/61770 https://ci.guix.gnu.org/build/469982/details ------ applying '/gnu/store/b9kc2xs6407hmpzcvx44g1mi88ls0509-linux-libre-infodocs-target.patch'... Backtrace: 5 (primitive-load "/gnu/store/6hr5qlvj92idkp2hmnwk7f16ah4?") In ice-9/eval.scm: 619:8 4 (_ #(#(# "lin?") #)) In ice-9/boot-9.scm: 142:2 3 (dynamic-wind # ?) In ice-9/eval.scm: 619:8 2 (_ #(#(#))) In srfi/srfi-1.scm: 634:9 1 (for-each # _) In guix/build/utils.scm: 762:6 0 (invoke "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-p?" ?) guix/build/utils.scm:762:6: In procedure invoke: ERROR: 1. &invoke-error: program: "/gnu/store/z39hnrwds1dgcbpfgj8dnv2cngjb2xbl-patch-2.7.6/bin/patch" arguments: ("--force" "--no-backup-if-mismatch" "-p1" "--input" "/gnu/store/b9kc2xs6407hmpzcvx44g1mi88ls0509-linux-libre-infodocs-target.patch") exit-status: 1 term-signal: #f stop-signal: #f builder for `/gnu/store/qvhbmfmsjryxs0mwmv0apl2110vdmaz2-linux-libre-6.2.1-guix.tar.xz.drv' failed with exit code 1 ------