Bump to 6.7.4

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 22 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eac189ca9da0..e2f76c3a2ea8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux SCHED-EXT + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 6.7.3
+	pkgver = 6.7.4
 	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
@@ -23,16 +23,16 @@ pkgbase = linux-cachyos
 	makedepends = python
 	depends = scx-scheds
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.3.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.7.4.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.7/sched/0001-sched-ext.patch
-	b2sums = 2dea0685e5c9b279beb7661f4efa91ccd662d55eb7c5a69aff52fc74bbb574fcb490a9abcc44d895583ca21b3e6860b3c5e9c35daae66b22c4fe97cab44b2a75
-	b2sums = 1da8ae554a57e2c2ecbc2bce091a8f27f2f8403b63a4c38f0c1df0b1607de67abbe99ba5fcb87a246a46e925b762865adc092bf18c7317d5b19e58087d787491
+	b2sums = 578114990b2987e2b241a7492bd4a69c46adfd613eba9715d63fd4565c19678dfab06b5107a0ff791e9a3190cb52b75a76d231aa39d4e7fba24e79f7f18935a1
+	b2sums = 5ce6df7f9a6a2e8c3e03846349d866c3219fa5a71ff7e84337597b74231e01b10ccf2aa548b3ef7cdcb986fafd1e367cc0d2a2b3f227d2953e61b7fb91bbb1e5
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
-	b2sums = 26718a5e97d200e41ef64016e940c4d349dc9513cdc0c9fce097d487d5290865a9989b8b060e2b97db667c04ed30f51722878be48fb224cf30193b8bcf600f1a
-	b2sums = 866e65bf9e40b604b931034a21c650a665ebbb99fb5a142a23a3df250e45f30955ee37004b42dcc1fca16ecd4043d76b9388944576458d04d23a7cc97e3714a2
+	b2sums = 72412dc5e291e70000d44f666ad332386e27870e832eb37375cfc13013eeffe01a9e417fa15dfa1008c96108db8ccec301a42f21174ee9957f1127b2db92e6ff
+	b2sums = e0d937ba0cd91afa561e627391674d3e4a9ae8ed4040c587de6f845552244a95a56df64822e86e700e7bf00edbed569d4bb2b7919752829f02212e8c5b7fcd5d
 
 pkgname = linux-cachyos
 	pkgdesc = The Linux SCHED-EXT + Cachy Sauce scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 1d403c62449c..1013ce25afaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -134,7 +134,8 @@ _use_llvm_lto=${_use_llvm_lto-none}
 
 # Use suffix -lto only when requested by the user
 # Enabled by default.
-# If you do not want the suffix -lto remove the "y" sign next to the flag.
+# y - enable -lto suffix
+# n - disable -lto suffix
 # https://github.com/CachyOS/linux-cachyos/issues/36
 _use_lto_suffix=${_use_lto_suffix-y}
 
@@ -155,16 +156,16 @@ _build_zfs=${_build_zfs-}
 # This does replace the requirement of nvidia-dkms
 _build_nvidia=${_build_nvidia-}
 
-if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ -n "$_use_lto_suffix" ]; then
+if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] && [ "$_use_lto_suffix" = "y"  ]; then
     pkgsuffix=cachyos-lto
     pkgbase=linux-$pkgsuffix
 
-else
+elif [ -n "$_use_llvm_lto" ]  ||  [[ "$_use_lto_suffix" = "n" ]]; then
     pkgsuffix=cachyos
     pkgbase=linux-$pkgsuffix
 fi
 _major=6.7
-_minor=3
+_minor=4
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@@ -219,7 +220,8 @@ fi
 # NVIDIA pre-build module support
 if [ -n "$_build_nvidia" ]; then
     source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
-             "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
+             "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch"
+             "$_patchsource/misc/nvidia/nvidia-drivers-470.223.02-gpl-pfn_valid.patch")
 fi
 
 ## List of CachyOS schedulers
@@ -265,6 +267,7 @@ prepare() {
         src="${src##*/}"
         src="${src%.zst}"
         [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
+        [[ $src = nvidia-drivers-470.223.02-gpl-pfn_valid.patch ]] && continue
         [[ $src = *.patch ]] || continue
         echo "Applying patch $src..."
         patch -Np1 < "../$src"
@@ -632,6 +635,8 @@ prepare() {
         # Temporary fix for fbdev=1
         # https://forums.developer.nvidia.com/t/545-29-06-18-1-flip-event-timeout-error-on-startup-shutdown-and-sometimes-suspend-wayland-unusable/274788/21
         patch -Np0 -i "${srcdir}/nvidia-drm-hotplug-workqueue.patch" -d "${srcdir}/${_nv_pkg}"
+        # Temporary fix for nvidia module build
+        patch -Np2 --no-backup-if-mismatch -i "${srcdir}/nvidia-drivers-470.223.02-gpl-pfn_valid.patch" -d "${srcdir}/${_nv_pkg}/kernel"
     fi
 }
 
@@ -816,8 +821,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-b2sums=('2dea0685e5c9b279beb7661f4efa91ccd662d55eb7c5a69aff52fc74bbb574fcb490a9abcc44d895583ca21b3e6860b3c5e9c35daae66b22c4fe97cab44b2a75'
-        '1da8ae554a57e2c2ecbc2bce091a8f27f2f8403b63a4c38f0c1df0b1607de67abbe99ba5fcb87a246a46e925b762865adc092bf18c7317d5b19e58087d787491'
+b2sums=('578114990b2987e2b241a7492bd4a69c46adfd613eba9715d63fd4565c19678dfab06b5107a0ff791e9a3190cb52b75a76d231aa39d4e7fba24e79f7f18935a1'
+        '5ce6df7f9a6a2e8c3e03846349d866c3219fa5a71ff7e84337597b74231e01b10ccf2aa548b3ef7cdcb986fafd1e367cc0d2a2b3f227d2953e61b7fb91bbb1e5'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
-        '26718a5e97d200e41ef64016e940c4d349dc9513cdc0c9fce097d487d5290865a9989b8b060e2b97db667c04ed30f51722878be48fb224cf30193b8bcf600f1a'
-        '866e65bf9e40b604b931034a21c650a665ebbb99fb5a142a23a3df250e45f30955ee37004b42dcc1fca16ecd4043d76b9388944576458d04d23a7cc97e3714a2')
+        '72412dc5e291e70000d44f666ad332386e27870e832eb37375cfc13013eeffe01a9e417fa15dfa1008c96108db8ccec301a42f21174ee9957f1127b2db92e6ff'
+        'e0d937ba0cd91afa561e627391674d3e4a9ae8ed4040c587de6f845552244a95a56df64822e86e700e7bf00edbed569d4bb2b7919752829f02212e8c5b7fcd5d')
diff --git a/config b/config
index 1cbd4335affc..ea82b30e1df9 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.7.2 Kernel Configuration
+# Linux/x86 6.7.3 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20231110"
 CONFIG_CC_IS_GCC=y
@@ -11564,7 +11564,7 @@ CONFIG_STACKTRACE=y
 #
 # Debug kernel data structures
 #
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PLIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set