From unknown Fri Jun 20 05:29:09 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61798 <61798@debbugs.gnu.org> To: bug#61798 <61798@debbugs.gnu.org> Subject: Status: infodoc patch doesn't apply to linux 6.2 Reply-To: bug#61798 <61798@debbugs.gnu.org> Date: Fri, 20 Jun 2025 12:29:09 +0000 retitle 61798 infodoc patch doesn't apply to linux 6.2 reassign 61798 guix submitter 61798 Leo Famulari severity 61798 normal tag 61798 notabug thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 21:21:53 2023 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 To: Maxim Cournoyer Subject: infodoc patch doesn't apply to linux 6.2 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: bug-guix@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) 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 ------ From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 25 23:23:26 2023 Received: (at 61798) by debbugs.gnu.org; 26 Feb 2023 04:23:26 +0000 Received: from localhost ([127.0.0.1]:42077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW8ZK-0004QU-3H for submit@debbugs.gnu.org; Sat, 25 Feb 2023 23:23:26 -0500 Received: from mail-qt1-f174.google.com ([209.85.160.174]:42849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pW8ZF-0004QC-Da for 61798@debbugs.gnu.org; Sat, 25 Feb 2023 23:23:23 -0500 Received: by mail-qt1-f174.google.com with SMTP id ay9so3507099qtb.9 for <61798@debbugs.gnu.org>; Sat, 25 Feb 2023 20:23:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4rBTFrEU/9NzjST0LrVUHT4IgJTnWNcFYK9E/L7TadU=; b=EF0uSJq9B+Y4DT/vJ01iI4kC3MR6L1tXW8GpoEdpyEX0bqY7TdzNU/biFl4q0o6STY k65rBX+8S9vG44Vh6WbUJhIRsJ4V22cIohx4OX+Ag8IbvsDBuw7FmDcfvO96aozvh2q4 W6c53Q9cjMNIrwS229ya7M90sXRhfa9Vv31/0eZ00EKgXu0Xa/s+nTtg8rSQoB3RTAWL 5V740EdHesHqHmqYRLfPUFn8ku0yxO1fmLU5bGTQjKg/23qYg7ONG39cObxYW4Z5FumO MyM4VMxZLUyg2EvsIj+1HURw6a7yZNP80K2OPCUyG6UcIR2ILTlLuD8rnltsppY6fxb2 7u8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4rBTFrEU/9NzjST0LrVUHT4IgJTnWNcFYK9E/L7TadU=; b=IL1cr1HNd/6E/wWrX+l9OG7sv97tcCIBfy7FxSdKVJjfaBBsP/rOUa7BrMe8XsZC1Y ksWnbzkWFdcU8Fp50noC35zIKcdLE23Y61g2c2/1IjXcJJvHZhvFG1La6kZMhTRF0N+6 3mzJzliGp9Jq8V3ONdf0URdhtmpLUABueTUARdEBWuIsnGcsPigzH4yaRCUKIGpUb/4z HAzHFa88AuV2COKLDhXRKQky8Ds1CX8+kH2+KBDwYZX5lOZVpJlI8Hd01GuL32hE6H+/ Ct46bNwP0rd49gDFT6gHWI9fzcjvrUTBaO15PqS40PE7zkYX0pYeMgKDBLagYHVm65V/ /gyA== X-Gm-Message-State: AO0yUKUYqTNDDxskVOD/T0rg9kp4JsJklRi7eae6mKwnr135m1p7TJTH MyfOMQFhqY/A1mKxycBf+6lzpgeja/IufZrn X-Google-Smtp-Source: AK7set/W5XdUJM/FqRp+DSEvP6deHve67PrnmUWNBu37vm5JcmiZLWCK43mOCd5V23A59t8klwOroQ== X-Received: by 2002:ac8:5e48:0:b0:3bf:c25c:838 with SMTP id i8-20020ac85e48000000b003bfc25c0838mr10112494qtx.68.1677385395403; Sat, 25 Feb 2023 20:23:15 -0800 (PST) Received: from hurd (dsl-141-27.b2b2c.ca. [66.158.141.27]) by smtp.gmail.com with ESMTPSA id f2-20020ac81342000000b003bfb6ddc49dsm2383346qtj.1.2023.02.25.20.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 20:23:15 -0800 (PST) From: Maxim Cournoyer To: Leo Famulari Subject: Re: infodoc patch doesn't apply to linux 6.2 References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> Date: Sat, 25 Feb 2023 23:23:13 -0500 In-Reply-To: (Leo Famulari's message of "Sat, 25 Feb 2023 21:21:19 -0500") Message-ID: <87cz5xdphq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61798 Cc: 61798@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Leo, Leo Famulari writes: > 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. It's indeed been applied upstream. Can't we just drop our local version of it? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 26 12:38:42 2023 Received: (at 61798) by debbugs.gnu.org; 26 Feb 2023 17:38:42 +0000 Received: from localhost ([127.0.0.1]:45018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWKyw-0006ay-1A for submit@debbugs.gnu.org; Sun, 26 Feb 2023 12:38:42 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:40359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWKyt-0006ag-Bk for 61798@debbugs.gnu.org; Sun, 26 Feb 2023 12:38:40 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E0700320046F; Sun, 26 Feb 2023 12:38:31 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sun, 26 Feb 2023 12:38:32 -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=1677433111; x=1677519511; bh=HtKdUPTecAJFNKs8eaCDRRnahU/nhjMJFLhkDCTZ/ss=; b=O7oq1hnjULk9 4CjIeEfRUoSVHzX8CZrj6PMm32YUHX8YQPdmwE1UWKGZAS6jbcJ5/rkTlx1MdFEY W25zaVlRa70DBtDDL7RVGABSLMNM5xEFJ4wfZl4woYMSqo2JRPfNQqFPExjj8D4I PqPx/RJtDqYch+xVwLG4/QhEpmhgyzI= 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=1677433111; x=1677519511; bh=HtKdUPTecAJFNKs8eaCDRRnahU/n hjMJFLhkDCTZ/ss=; b=KHKJ+R8CVzJsiJkh0bNsutAO7iORM40MuKprGrLRZYeI C+/ESfsDOxgeJjI0c7dPJwvuTjzZ0Jclt5psFUE9ikjHvNF+BelWcJu3FF2pOgFs ZX800VtLlnkz+xOrAJJK8OhowAkTqjqbNjGzbO3/f6gtiu5OxJEBm7aXxExeFD44 aakhy6ifE2pGd/v33JZQNNv22G/w/ekgnrvRR5a7fis33VCm9YXjxCaNu4nWdHrq dECNsdteaegHIupsO9oGCmwZeBd/tCCkaxGd4z/LqEZHZwqBVJ9z+7wX9oySrwOW xUeRDctX5BcZEU/qSJ3Nq2QNovW3F63/ndBKPrru/Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudekkedgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepieetudehfeekueefleegudfhjefgleehfeeluefhfeffgfeuudelhedvjeel ieetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 26 Feb 2023 12:38:31 -0500 (EST) Date: Sun, 26 Feb 2023 12:38:29 -0500 From: Leo Famulari To: Maxim Cournoyer Subject: Re: infodoc patch doesn't apply to linux 6.2 Message-ID: References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> <87cz5xdphq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87cz5xdphq.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61798 Cc: 61798@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Sat, Feb 25, 2023 at 11:23:13PM -0500, Maxim Cournoyer wrote: > It's indeed been applied upstream. Can't we just drop our local version > of it? Do I need to set the 'doc-supported?' value somehow for particular kernel versions? It would be helpful for me if you could try it, if this stuff is still fresh in your mind, since you implemented it. From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 27 08:40:45 2023 Received: (at 61798) by debbugs.gnu.org; 27 Feb 2023 13:40:45 +0000 Received: from localhost ([127.0.0.1]:46388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWdkD-0000u2-4a for submit@debbugs.gnu.org; Mon, 27 Feb 2023 08:40:45 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:43617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWdkB-0000tm-Aq for 61798@debbugs.gnu.org; Mon, 27 Feb 2023 08:40:44 -0500 Received: by mail-qt1-f176.google.com with SMTP id cf14so6526821qtb.10 for <61798@debbugs.gnu.org>; Mon, 27 Feb 2023 05:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jvvIcmCKBQ/Lul42K0qvSrXsCg7HeeRXMXjlKdUZmVg=; b=X6WcXtB5cmncjB1adTE6g8eqrm6P3U873TvKtsrf0NvmLhORd7Grp3yJkt/YOxJGn3 yqk7zMiDNVJcgEdPbV8385tfw2urpD64KiEP8lGr+4oRhtODlfWhd9E90WKPXltrJ7Cw gjM8+hTVx8FldEKcH9el7EHQWjGYanFnWYnlBzzsONZZczsx2Ra8YLVRlUyuqArBvn/e 6jPBLeEJWgPLaHK4Q0AWfsPe/bAXvPZhCrJ9mocHx17mUfFJIfBufssH1P6coyuhQw6b e+49rtAs1TZ2X69q4Z+i2CAl+hsKTpJQhCFwNk7vZWvx91KmVmPk2h5Y+rPwyIrkBrbL B8vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jvvIcmCKBQ/Lul42K0qvSrXsCg7HeeRXMXjlKdUZmVg=; b=1uT6SsotHm7Jk45a98E4/4ATXYtwvox4q8PF1jJQWT2gCJ+gUqAZQrw+2IFhCrb9QY UBOHJoAF/L4fRhEGs/Q/f5iuls+iIOglnVHrZao3JbmdD5v4xQCgzwH6P1Iem7ygROv0 X4t3anRjetB9rVqRENsrXOU1GhUwJv5u37VDUoW5qxSJ7rwBSzPHrAP/sPjVfFU12bYQ qpR9NUgsyy+pIyTDsBxcwxe4cLQYwZmXJuBLxXqUDUMFfB5EwEqURaB7vrpWSVMN4p9N 2s2LV3wUiaKLkzQ05Wmww/2IDkTyRIzn4q7O+tJBiPUF4mnc0RGOaUsqkEl1E2Z05H34 v6mg== X-Gm-Message-State: AO0yUKVfbvyFXsD+jNwMdwzjUFpVAUxoGKpqzQ8g12CjwGCMGzcx1pn2 jtZw235LWNpdqe3vAi2IKn9Aq/4bzgESFg== X-Google-Smtp-Source: AK7set8npiW7syRzYfiFMm44USrnNt/Z+f12TvaFhjYJjDUyiPHMdr8Lo76M1pT/wM2CqR3u1kqThw== X-Received: by 2002:ac8:7d49:0:b0:3b8:6d3a:5ed4 with SMTP id h9-20020ac87d49000000b003b86d3a5ed4mr42791237qtb.67.1677505237493; Mon, 27 Feb 2023 05:40:37 -0800 (PST) Received: from hurd (dsl-156-86.b2b2c.ca. [66.158.156.86]) by smtp.gmail.com with ESMTPSA id r9-20020ac84249000000b003b643951117sm4631228qtm.38.2023.02.27.05.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 05:40:37 -0800 (PST) From: Maxim Cournoyer To: Leo Famulari Subject: Re: infodoc patch doesn't apply to linux 6.2 References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> <87cz5xdphq.fsf@gmail.com> Date: Mon, 27 Feb 2023 08:40:36 -0500 In-Reply-To: (Leo Famulari's message of "Sun, 26 Feb 2023 12:38:29 -0500") Message-ID: <87o7pfkyzv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61798 Cc: 61798@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Leo, Leo Famulari writes: > On Sat, Feb 25, 2023 at 11:23:13PM -0500, Maxim Cournoyer wrote: >> It's indeed been applied upstream. Can't we just drop our local version >> of it? > > Do I need to set the 'doc-supported?' value somehow for particular > kernel versions? It would be helpful for me if you could try it, if this > stuff is still fresh in your mind, since you implemented it. This should allow you to proceed as usual: --8<---------------cut here---------------start------------->8--- 1 file changed, 5 insertions(+), 5 deletions(-) gnu/packages/linux.scm | 10 +++++----- modified gnu/packages/linux.scm @@ -620,8 +620,7 @@ (define (source-with-patches source patches) (define-public linux-libre-6.2-source (source-with-patches linux-libre-6.2-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch - (search-patch "linux-libre-infodocs-target.patch")))) + %linux-libre-arm-export-__sync_icache_dcache-patch))) (define-public linux-libre-6.1-source (source-with-patches linux-libre-6.1-pristine-source @@ -889,10 +888,11 @@ (define (config->string options) ;;; Kernel package utilities. ;;; -(define (doc-supported? version) +(define (apply-infodoc-patch? version) ;; Versions older than 5.10 have different enough build scripts that the ;; infodocs patch doesn't apply. - (version>=? version "5.10")) + (and (version>=? version "5.10") + (not (version>=? version "6.2")))) ;patch applied upstream (define* (make-linux-libre version gnu-revision hash-string supported-systems #:key @@ -905,7 +905,7 @@ (define* (make-linux-libre version gnu-revision hash-string supported-systems (extra-options %default-extra-linux-options) (patches `(,%boot-logo-patch - ,@(if (doc-supported? version) + ,@(if (apply-infodoc-patch? version) (list (search-patch "linux-libre-infodocs-target.patch")) '())))) --8<---------------cut here---------------end--------------->8--- -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 09:56:40 2023 Received: (at control) by debbugs.gnu.org; 2 Mar 2023 14:56:40 +0000 Received: from localhost ([127.0.0.1]:58070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXkMK-0007Em-24 for submit@debbugs.gnu.org; Thu, 02 Mar 2023 09:56:40 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXkMI-0007Ef-M2 for control@debbugs.gnu.org; Thu, 02 Mar 2023 09:56:38 -0500 Received: by mail-qt1-f173.google.com with SMTP id y10so13579785qtj.2 for ; Thu, 02 Mar 2023 06:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=fUukRyCUvKhYtmNVrHvqO9PW93RtpzL2wqghMOz4b3g=; b=deNtuDvKPzMdFGQ+U/JgSC/foY4B29acK8M/8Fkb/zlB8VRURalgUlfw31f4SXnyAK nUA8Dupyb0Gr/aSoHakKXzLJgeHy9NeQeaMjHjoIxYd9LyyOe7fIq0TsLij3Y//T9RVy +PiE3boE8JLRAw+3w26l1kJEWZPty49HkfKfou6G12wzKfHt3BMOA5S4JjQn9E3uwcXY mPeR39xuvFHr7NX7fVbcUn97p9f7RzTw2vYBDuOXPN92LndCskt7hOenOXZLzZP5QUW4 4DPUf286kQIKyHl96zNSQmOhgUCXqTBvQ/A/g7k7p5VZbOctxf/fN06gL4oqxZlW/Zc3 OcXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fUukRyCUvKhYtmNVrHvqO9PW93RtpzL2wqghMOz4b3g=; b=bNPnel1u2PkvS2Wt6WzAqCnSr1Q1XhgFzlCC2VzxSGJIA1nni9Qmdy13chAe0JMDCm 7Cv8d38AX09wo4XzF2eYCKpi6Suva4Fa0XQLYFD+ASK+aJWuIbF/4OmoJ0c302X+ka4P 9T8pGM2FPlrGv5jQ+LbYcainGMeqCYFQ3xBrv01JbpH0Ij4muq6k9Ygk9zRnlAlCnQqL 9WhSC7VMc+xdU3yo+fzPB8eV1GstVXHoQ1SpJm9CA5Ql8Pmw9lrJTLIUzl8dpZ7Q9vf3 6RtI0LPQaC5B8QsdTGPn2YBEUVBXCVY7009r26ENsvBYy/qQdhr7LT+XTPqKNC6yr+xp oTHQ== X-Gm-Message-State: AO0yUKVOawCoVHooffj3331+3xoG/AKDSkVfeek2eS3Lh/+KEv4UvqSV 2BvMXwmwESYvtYOtvg5LxiKSJv5gVkum6A== X-Google-Smtp-Source: AK7set/eg1iE2LsxxCS/XOA3xKCm52CRneQxlEfKdr6VRPOWOjDnajk1Nyp72aTg6VkfdhggGU7ioA== X-Received: by 2002:ac8:5a89:0:b0:3b6:35a2:bb04 with SMTP id c9-20020ac85a89000000b003b635a2bb04mr18117646qtc.7.1677768993039; Thu, 02 Mar 2023 06:56:33 -0800 (PST) Received: from hurd (dsl-10-128-15.b2b2c.ca. [72.10.128.15]) by smtp.gmail.com with ESMTPSA id n24-20020a05620a223800b007426b917031sm10953941qkh.121.2023.03.02.06.56.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 06:56:32 -0800 (PST) Date: Thu, 02 Mar 2023 09:56:31 -0500 Message-Id: <87zg8vfbhc.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #61798 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 61798 notabug close 61798 quit From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 03 19:35:05 2023 Received: (at 61798-done) by debbugs.gnu.org; 4 Mar 2023 00:35:05 +0000 Received: from localhost ([127.0.0.1]:34269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYFrc-0005zM-On for submit@debbugs.gnu.org; Fri, 03 Mar 2023 19:35:05 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:38519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYFra-0005yo-HQ for 61798-done@debbugs.gnu.org; Fri, 03 Mar 2023 19:35:02 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B6CEF32009BE; Fri, 3 Mar 2023 19:34:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 03 Mar 2023 19:34:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:cc:content-type: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=1677890096; x=1677976496; bh=+N6CPGzJUyiZiLUsY/qyIrvRAuBWDC2DZN8dB6uBOBY=; b= KhUwaI+K9tzr6gZZOeyEltOJiwrQmWidmpoLNR2gu/bR6/iWVVpajxJlgvYwdNGy SmDMBZSbxcrb/P7ibfYVVNtQWU4K617f9E2CTQ8fVrLjib0n9n/BK0y3xLpptoxs BYJrQlXJBpXo2jDMm4C11OukKy72o/H+1b1lBKmWogs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type: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=1677890096; x=1677976496; bh=+N6CPGzJUyiZi LUsY/qyIrvRAuBWDC2DZN8dB6uBOBY=; b=pY1j/AH1U/z3wY8DKZS58mugG7c3O agcXAgB+c2OCnURkBkxWy+rVWBZKgJyA5kKwISc9qcLsiSRiLXuSTrjtQef/T3La ZJjI0rg4fBQx3jVq1qbpDWP27Sm/MGOZbfk9Ea7f/eN8gHX/OHeom9RcuiyT/vCE 6JDisJPzYdrDw7A2+rvmYhF7vS2PSJEju9Q6TLrUNPa5l+Y6OQ+2a/2VlQMGv3/6 lqtFRb5wsV7uQwAgFo/U43dL6itU3GfPaaEaw0u9ViAwQLrQWayczSxllMXj8zM0 HmfGnTbXCVxSyPnAyVVNL6Xjkf7HcpIYM2AHFGrIKEn2LQqxLGz+GKDFg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvddttddgvddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepnfgvohcu hfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgrrhhirdhnrghmvgeqnecuggftrfgrth htvghrnhepteehuedviedvleeuueekhfdtieehtdeghfdvvdelhfdujeduieehleefveet uefhnecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 3 Mar 2023 19:34:54 -0500 (EST) Date: Fri, 3 Mar 2023 19:34:53 -0500 From: Leo Famulari To: Maxim Cournoyer Subject: Re: infodoc patch doesn't apply to linux 6.2 Message-ID: References: <20221116165551.23244-1-maxim.cournoyer@gmail.com> <87cz5xdphq.fsf@gmail.com> <87o7pfkyzv.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87o7pfkyzv.fsf@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61798-done Cc: 61798-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Mon, Feb 27, 2023 at 08:40:36AM -0500, Maxim Cournoyer wrote: > This should allow you to proceed as usual: [...] Thanks! I've prepared the patch, availabe as part of this patch series: https://issues.guix.gnu.org/61947 From unknown Fri Jun 20 05:29:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 01 Apr 2023 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator