diff options
| author | Florian Franzmann | 2022-05-20 18:53:38 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2022-05-20 18:53:38 +0200 |
| commit | 931571804ec6800a3b84c01a7f294ca0f8003986 (patch) | |
| tree | 92dfe9499a44236238bbfeae3e714ff5e37b7676 | |
| parent | 23cf518c7c207d687c2b36a0b1c896b59fa5f2f2 (diff) | |
z-kernels/nvidia_driver: add conflict with nvidia-open-gpu-kernel-modules
| -rwxr-xr-x | z-kernels/nvidia_driver/CONFLICTS | 7 | ||||
| -rw-r--r-- | z-kernels/nvidia_driver/HISTORY | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/z-kernels/nvidia_driver/CONFLICTS b/z-kernels/nvidia_driver/CONFLICTS index 8b0c723e..99df1c66 100755 --- a/z-kernels/nvidia_driver/CONFLICTS +++ b/z-kernels/nvidia_driver/CONFLICTS @@ -1,6 +1,7 @@ -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_legacy_340xx && +conflicts nvidia-open-gpu-kernel-modules diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY index 528ec25b..3a4d6ea8 100644 --- a/z-kernels/nvidia_driver/HISTORY +++ b/z-kernels/nvidia_driver/HISTORY @@ -1,3 +1,6 @@ +2022-05-20 Florian Franzmann <bwlf@bandrate.org> + * CONFLICTS: add conflict with nvidia-open-gpu-kernel-modules + 2022-04-25 Florian Franzmann <bwlf@bandrate.org> * DETAILS: stable version 510.68.02 |