sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (17c42ebac4f722107a40a3db82cd6ada963a7154)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (17c42ebac4f722107a40a3db82cd6ada963a7154)
- Date: Mon, 23 May 2022 18:18:45 +0000
GIT changes to master z-rejected grimoire by Florian Franzmann
<bwlf AT bandrate.org>:
z-kernels/nvidia_driver/CONFLICTS | 7 +++----
z-kernels/nvidia_driver/HISTORY | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 17c42ebac4f722107a40a3db82cd6ada963a7154
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>
Revert "z-kernels/nvidia_driver: add conflict with
nvidia-open-gpu-kernel-modules"
This reverts commit 931571804ec6800a3b84c01a7f294ca0f8003986.
nvidia-open-gpu-kernel-modules optionally depends on this spell.
diff --git a/z-kernels/nvidia_driver/CONFLICTS
b/z-kernels/nvidia_driver/CONFLICTS
index 99df1c6..8b0c723 100755
--- a/z-kernels/nvidia_driver/CONFLICTS
+++ b/z-kernels/nvidia_driver/CONFLICTS
@@ -1,7 +1,6 @@
-conflicts nvidia_legacy &&
-conflicts nvidia_legacy_96xx &&
+conflicts nvidia_legacy &&
+conflicts nvidia_legacy_96xx &&
conflicts nvidia_legacy_173xx &&
conflicts nvidia_legacy_295xx &&
conflicts nvidia_legacy_304xx &&
-conflicts nvidia_legacy_340xx &&
-conflicts nvidia-open-gpu-kernel-modules
+conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index aa658f4..abe6558 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,5 +1,4 @@
2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
- * CONFLICTS: add conflict with nvidia-open-gpu-kernel-modules
* DETAILS: stable version 510.73.05
2022-04-25 Florian Franzmann <bwlf AT bandrate.org>
- [SM-Commit] GIT changes to master z-rejected grimoire by Florian Franzmann (17c42ebac4f722107a40a3db82cd6ada963a7154), Florian Franzmann, 05/23/2022
Archive powered by MHonArc 2.6.24.