Bump to 6.6.9

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

4 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7732622bd407..74caae2e36da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 6.6.8
+	pkgver = 6.6.9
 	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
@@ -22,16 +22,16 @@ pkgbase = linux-cachyos
 	makedepends = patch
 	makedepends = python
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.8.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.6.9.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.6/sched/0001-bore-cachy.patch
-	b2sums = d6f58bfae29239f985c1aa329b19c2fdea1c08c79e819e60f85359e9ef00e97a7f72d74662df7d9def75ff85a3b4bdf36dc9ded578ee472e9b4efa7bf50fcd33
-	b2sums = 5ddb5dcdb79354268e69d01523f06d5071538ba53171adcef0dd455b286df7785611d64f13b3aae06ac298cc60d990ebfa7b11d75dec9ab4a256b431de549483
-	b2sums = 11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0
+	b2sums = c7deb1221716144b636018ee2936abe6397e15204c9bdb4cb5806f6bd303cd5d3f953a7da5865c4f211b866e4dfec4cd347c0a1a0a675f18b1a4ad197b099cec
+	b2sums = c42397e4b74a3ac125d6581e1698285825be6625334b98f5417ae276572689b70fa2d328d9ad51f8e768beb72879d9163abd444562fe68db2bd5ed9d04761d16
+	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
 	b2sums = a5e5c6ad326c2e3522ff6d6208e87c06a1d545dfecc47cd50dc1176dc5409cc8a2ae380e7bc0f2a191d835558fb5c7d5b7de1b2e250b019b7f45088a60bac0cf
-	b2sums = 900ab144d6b7339c926f229b96891fb2862020b6c27716a7c75ddcf6e92f7c129bc823ef604f45b81fc848012263c7933ce4c10ca75676323315b5f2411ab37e
+	b2sums = 41872c36e0d4ffa2daf9718587e75714b430a72988cd7b7d6f6292842ba99ec63ae8d595f3b828d2c33f989a2193072c3c4626fbedda27ee836b88a24315fd64
 
 pkgname = linux-cachyos
 	pkgdesc = The Linux EEVDF-BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index abe798693943..c37addb05f63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -168,7 +168,7 @@ else
     pkgbase=linux-$pkgsuffix
 fi
 _major=6.6
-_minor=8
+_minor=9
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
@@ -222,7 +222,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")
+    source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
+             "$_patchsource/misc/nvidia/nvidia-drm-hotplug-workqueue.patch")
 fi
 
 ## ToDo: Adjust for new Scheduler Changes
@@ -276,6 +277,7 @@ prepare() {
         src="${src%%::*}"
         src="${src##*/}"
         src="${src%.zst}"
+        [[ $src = nvidia-drm-hotplug-workqueue.patch ]] && continue
         [[ $src = *.patch ]] || continue
         echo "Applying patch $src..."
         patch -Np1 < "../$src"
@@ -640,6 +642,10 @@ prepare() {
     if [ -n "$_build_nvidia" ]; then
         cd "${srcdir}"
         sh "${_nv_pkg}.run" --extract-only
+
+        # 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}"
     fi
 }
 
@@ -791,7 +797,7 @@ _package-headers() {
 
 _package-zfs(){
     pkgdesc="zfs module for the $pkgdesc kernel"
-    depends=('pahole' linux-$pkgsuffix=$_kernver)
+    depends=('pahole' $pkgbase=$_kernver)
     provides=('ZFS-MODULE')
 
     cd ${srcdir}/"zfs"
@@ -803,7 +809,7 @@ _package-zfs(){
 
 _package-nvidia(){
     pkgdesc="nvidia module of ${_nv_ver} driver for the linux-$pkgsuffix kernel"
-    depends=("linux-$pkgsuffix=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
+    depends=("$pkgbase=$_kernver" "nvidia-utils=${_nv_ver}" "libglvnd")
     provides=('NVIDIA-MODULE')
     license=('custom')
 
@@ -824,8 +830,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-b2sums=('d6f58bfae29239f985c1aa329b19c2fdea1c08c79e819e60f85359e9ef00e97a7f72d74662df7d9def75ff85a3b4bdf36dc9ded578ee472e9b4efa7bf50fcd33'
-        '5ddb5dcdb79354268e69d01523f06d5071538ba53171adcef0dd455b286df7785611d64f13b3aae06ac298cc60d990ebfa7b11d75dec9ab4a256b431de549483'
-        '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
+b2sums=('c7deb1221716144b636018ee2936abe6397e15204c9bdb4cb5806f6bd303cd5d3f953a7da5865c4f211b866e4dfec4cd347c0a1a0a675f18b1a4ad197b099cec'
+        'c42397e4b74a3ac125d6581e1698285825be6625334b98f5417ae276572689b70fa2d328d9ad51f8e768beb72879d9163abd444562fe68db2bd5ed9d04761d16'
+        '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
         'a5e5c6ad326c2e3522ff6d6208e87c06a1d545dfecc47cd50dc1176dc5409cc8a2ae380e7bc0f2a191d835558fb5c7d5b7de1b2e250b019b7f45088a60bac0cf'
-        '900ab144d6b7339c926f229b96891fb2862020b6c27716a7c75ddcf6e92f7c129bc823ef604f45b81fc848012263c7933ce4c10ca75676323315b5f2411ab37e')
+        '41872c36e0d4ffa2daf9718587e75714b430a72988cd7b7d6f6292842ba99ec63ae8d595f3b828d2c33f989a2193072c3c4626fbedda27ee836b88a24315fd64')
diff --git a/auto-cpu-optimization.sh b/auto-cpu-optimization.sh
index 4c4b20ea68fb..d99108d73bf0 100755
--- a/auto-cpu-optimization.sh
+++ b/auto-cpu-optimization.sh
@@ -31,7 +31,7 @@ case $MARCH in
   K8-SSE3) MARCH="K8SSE3";;
   BONNELL) MARCH="ATOM";;
   GOLDMONT-PLUS) MARCH="GOLDMONTPLUS";;
-  SKYLAKE-AVX512) MARCH="SKYLAKE2";;
+  SKYLAKE-AVX512) MARCH="SKYLAKEX";;
   MIVYBRIDGE)
     scripts/config --disable CONFIG_AGP_AMD64 
     scripts/config --disable CONFIG_MICROCODE_AMD
diff --git a/config b/config
index c1261c185cfa..6a7becb4946a 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.1 Kernel Configuration
+# Linux/x86 6.6.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
@@ -3557,7 +3557,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_INTEL=m
-CONFIG_DWMAC_LOONGSON=m
 CONFIG_STMMAC_PCI=m
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
@@ -11490,8 +11489,6 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
-# CONFIG_DEBUG_CREDENTIALS is not set
-
 #
 # RCU Debugging
 #