Bump to 6.8.1

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

3 files changed, 20 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ffb92e142d3..754ae97a2eb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements
-	pkgver = 6.8.0
+	pkgver = 6.8.1
 	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.8.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.8.1.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.8/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.8/sched/0001-sched-ext.patch
-	b2sums = c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2
-	b2sums = d663b890dc2e505a1892b42881bbac4965b7528c7cd8672d153b8659f6b3a8136314c7f5a17b9d1434d55310aae781532238d66f565ce9ae5f74c57e42edf736
+	b2sums = 2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929
+	b2sums = dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
-	b2sums = 5a6eadbd3a69a089eacf46dda698e49e8bd267bb60228d44720e5e1ddc621089d7a29bec16471cfc45b30e4405fd2865964e556cfb36be2d289e609f34947657
-	b2sums = 9661b9cb2e3337c59db846aad96944858de6ea3ed5f515c9171a86c68e52b75d5b54302f14d0f766f65daff25dd481edb8d3ee51f379ac8ae96f5585e38c1351
+	b2sums = 1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0
+	b2sums = 2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb
 
 pkgname = linux-cachyos
 	pkgdesc = The Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index eff848838e97..d538aff99e85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -158,12 +158,12 @@ elif [ -n "$_use_llvm_lto" ]  ||  [[ "$_use_lto_suffix" = "n" ]]; then
     pkgbase=linux-$pkgsuffix
 fi
 _major=6.8
-_minor=0
+_minor=1
 #_minorc=$((_minor+1))
 #_rcver=rc8
 pkgver=${_major}.${_minor}
-#_stable=${_major}.${_minor}
-_stable=${_major}
+_stable=${_major}.${_minor}
+#_stable=${_major}
 #_stablerc=${_major}-${_rcver}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
@@ -212,7 +212,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/0001-NVIDIA-take-modeset-ownership-early.patch")
 fi
 
 ## List of CachyOS schedulers
@@ -252,6 +253,7 @@ prepare() {
         src="${src%%::*}"
         src="${src##*/}"
         src="${src%.zst}"
+        [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
         [[ $src = *.patch ]] || continue
         echo "Applying patch $src..."
         patch -Np1 < "../$src"
@@ -521,6 +523,9 @@ prepare() {
     if [ -n "$_build_nvidia" ]; then
         cd "${srcdir}"
         sh "${_nv_pkg}.run" --extract-only
+
+        # Temporary fix for nvidia module
+        patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
     fi
 }
 
@@ -706,8 +711,8 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-b2sums=('c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2'
-        'd663b890dc2e505a1892b42881bbac4965b7528c7cd8672d153b8659f6b3a8136314c7f5a17b9d1434d55310aae781532238d66f565ce9ae5f74c57e42edf736'
+b2sums=('2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929'
+        'dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
-        '5a6eadbd3a69a089eacf46dda698e49e8bd267bb60228d44720e5e1ddc621089d7a29bec16471cfc45b30e4405fd2865964e556cfb36be2d289e609f34947657'
-        '9661b9cb2e3337c59db846aad96944858de6ea3ed5f515c9171a86c68e52b75d5b54302f14d0f766f65daff25dd481edb8d3ee51f379ac8ae96f5585e38c1351')
+        '1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0'
+        '2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb')
diff --git a/config b/config
index 1b1bfedbff92..104e4ae6c420 100644
--- a/config
+++ b/config
@@ -1046,7 +1046,7 @@ CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
-# CONFIG_BLK_DEV_WRITE_MOUNTED is not set
+CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_DEV_THROTTLING_LOW=y