From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6B331581D8 for ; Mon, 18 Nov 2024 09:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7708E0B65; Mon, 18 Nov 2024 09:06:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C4C8E0B64 for ; Mon, 18 Nov 2024 09:06:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A08D933BF08 for ; Mon, 18 Nov 2024 09:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 106911A9D for ; Mon, 18 Nov 2024 09:06:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1731920553.c82e85ffb3bae915fc2772a6c6705c0cf2b816e8.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ x11-drivers/nvidia-drivers/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c82e85ffb3bae915fc2772a6c6705c0cf2b816e8 X-VCS-Branch: master Date: Mon, 18 Nov 2024 09:06:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: efd78e67-1771-41b4-910f-ee7f6f82b00d X-Archives-Hash: ddabb0e3d7b594b6a80996cd23080aad commit: c82e85ffb3bae915fc2772a6c6705c0cf2b816e8 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Nov 18 08:06:50 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 18 09:02:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82e85ff x11-drivers/nvidia-drivers: drop obsolete kernel-6.7 patch in 535 Kind of forgot that was still there. Still applied given it changes the code in the "if not 6.7" conditional that nvidia started using (meaning harmless unused code). Signed-off-by: Ionen Wolkens gentoo.org> .../nvidia-drivers-535.43.22-kernel-6.7.patch | 24 ---------------------- .../nvidia-drivers-535.216.01-r1.ebuild | 3 --- 2 files changed, 27 deletions(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch deleted file mode 100644 index 08833de8344a..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch +++ /dev/null @@ -1,24 +0,0 @@ -Typically opt not to patch for kernel support downstream, but in this -case it's only conditionally broken depending on kernel crypto configs -and USE=kernel-open, then an (official) NVIDIA representative has -responded with a fix in [1] which should be safe. - -[1] https://github.com/NVIDIA/open-gpu-kernel-modules/issues/574#issuecomment-1809283181 ---- a/kernel/nvidia/libspdm_shash.c -+++ b/kernel/nvidia/libspdm_shash.c -@@ -89,4 +89,4 @@ - struct crypto_shash *dst_tfm = dst->tfm; -- char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base); -- char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base); -+ char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1); -+ char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1); - int ss = crypto_shash_statesize(dst_tfm); ---- a/kernel-module-source/kernel-open/nvidia/libspdm_shash.c -+++ b/kernel-module-source/kernel-open/nvidia/libspdm_shash.c -@@ -89,4 +89,4 @@ - struct crypto_shash *dst_tfm = dst->tfm; -- char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base); -- char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base); -+ char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1); -+ char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1); - int ss = crypto_shash_statesize(dst_tfm); diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild index f6b99ca641ae..9e36108889c6 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild @@ -140,9 +140,6 @@ src_prepare() { default - kernel_is -ge 6 7 && - eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch - # prevent detection of incomplete kernel DRM support (bug #603818) sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \ -i kernel{,-module-source/kernel-open}/conftest.sh || die