Conflict with newer linux-firmware versions

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15400ad7426f..17d539877ff0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = nouveau-fw-gsp
 	pkgdesc = NVIDIA GSP (Turing+) firmware for the latest GSP kernel code
 	pkgver = 535.113.01
-	pkgrel = 1
+	pkgrel = 2
 	url = https://us.download.nvidia.com/XFree86/Linux-x86_64/535.113.01/README/gsp.html
 	arch = any
 	license = MIT
 	license = custom
 	makedepends = git
 	makedepends = python3
+	conflicts = linux-firmware>=20231110.74158e7a
 	options = !strip
 	source = git+https://github.com/NVIDIA/open-gpu-kernel-modules.git#tag=535.113.01
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/535.113.01/NVIDIA-Linux-x86_64-535.113.01.run
diff --git a/PKGBUILD b/PKGBUILD
index 2cf0540e4505..c7703d9f5db8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@
 
 pkgname=nouveau-fw-gsp
 pkgver=535.113.01
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA GSP (Turing+) firmware for the latest GSP kernel code"
 arch=('any')
 url="https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/README/gsp.html"
 license=('MIT' 'custom')
 options=('!strip') # Disabled for now to prevent potential issues
 makedepends=('git' 'python3')
+conflicts=('linux-firmware>=20231110.74158e7a') # This package version has the GSP firmware now
 _nvidia="NVIDIA-Linux-x86_64-${pkgver}"
 _gsp_output="_out/nvidia"
 source=("git+https://github.com/NVIDIA/open-gpu-kernel-modules.git#tag=${pkgver}"