[nvidia-modprobe/f40: 4/4] Merge branch 'master' into f40
commit 7863aa84830bddc7115e47c9692a00ae71344588
Merge: 55be6d0 0a60221
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 27 22:21:58 2024 +0100
Merge branch 'master' into f40
nvidia-modprobe.spec | 14 ++++++++++++--
sources | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc nvidia-modprobe.spec
index 6e0d3cd,2f297f9..d4616c4
--- a/nvidia-modprobe.spec
+++ b/nvidia-modprobe.spec
@@@ -1,6 -1,6 +1,10 @@@
Name: nvidia-modprobe
Epoch: 3
++<<<<<<< HEAD
+Version: 550.90.07
++=======
+ Version: 555.58
++>>>>>>> master
Release: 1%{?dist}
Summary: Load the NVIDIA kernel module and create NVIDIA character device files