Sync with Github

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

3 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 754ae97a2eb1..c5c4f8bbe45b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements
 	pkgver = 6.8.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -23,16 +23,17 @@ pkgbase = linux-cachyos
 	makedepends = python
 	depends = scx-scheds
 	options = !strip
+	options = !debug
 	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 = 2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929
-	b2sums = dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe
+	b2sums = 8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
-	b2sums = 1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0
-	b2sums = 2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb
+	b2sums = 2617ffcdb57df5d2537382b89036dc9786c139815d14da7b3a246e74b204c6e84c04648a596316b467c05304fef2368491a3553344cac5475504edccdac58257
+	b2sums = 76b2dd6cf11ec1a8281556106b4458885e603e307c26f706b06dcdd8f8766ff045ae404a8cb197ac1d0ecd1bcdfef3d81a9ee492c371d0aaea4b8048cae6d384
 
 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 d538aff99e85..76ad8aaefa1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -168,12 +168,12 @@ _stable=${_major}.${_minor}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements'
-pkgrel=1
+pkgrel=2
 _kernver=$pkgver-$pkgrel
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
 license=('GPL2')
-options=('!strip')
+options=('!strip' '!debug')
 makedepends=('bc' 'libelf' 'pahole' 'cpio' 'perl' 'tar' 'xz' 'zstd' 'gcc' 'gcc-libs' 'glibc' 'binutils' 'make' 'patch' 'python')
 # LLVM makedepends
 if [[ "$_use_llvm_lto" = "thin" || "$_use_llvm_lto" = "full" ]] || [ -n "$_use_kcfi" ]; then
@@ -191,7 +191,7 @@ if [[ "$_cpusched" = "sched-ext" || "$_cpusched" = "cachyos" ]]; then
 fi
 
 _patchsource="https://raw.githubusercontent.com/cachyos/kernel-patches/master/${_major}"
-_nv_ver=550.54.14
+_nv_ver=550.67
 _nv_pkg="NVIDIA-Linux-x86_64-${_nv_ver}"
 source=(
     "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
@@ -212,8 +212,7 @@ 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/0001-NVIDIA-take-modeset-ownership-early.patch")
+    source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run")
 fi
 
 ## List of CachyOS schedulers
@@ -253,7 +252,6 @@ 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"
@@ -523,9 +521,6 @@ 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
 }
 
@@ -712,7 +707,7 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('2b518f8f39b4dcea1c580cb0664d59c165db989422fd6fd6b65d3dd1e4548bc6e0cedfc95c2584ae56f69ac1a1d3de6552ee61e77b08799a5275934a453ab929'
-        'dfaab80f3a80c770b0920140c73cb45895b5cfd87596be231306aa360220885474ca4fb0b99b9ecb1f865deffb030a91a8d932c6805e7c9e803c1d4d2be51dfe'
+        '8178cdd3224ca5b7ef9e971fdb403b57d4f4e44d3b9de31cf118bc1b195cf5d376b424cd5a5013c10182116b9ed18d09b893633ccf2486454d60bcced32149a0'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
-        '1b898b83320e71f13c6fc0568fbee36589d14eed777d41455cfe87b9b929345f2e1f2a35fa2a7483b9145deaa097b345fa341a20866cd8d105b13fcbcb2df4e0'
-        '2fff57e7883817a2890e2775b7bf829c473ceeb81c96eea408b2d7622ae92cb8c83c4df8e969197a4d50da3412fa60661fd07811342d9c55f2fda25926f20ddb')
+        '2617ffcdb57df5d2537382b89036dc9786c139815d14da7b3a246e74b204c6e84c04648a596316b467c05304fef2368491a3553344cac5475504edccdac58257'
+        '76b2dd6cf11ec1a8281556106b4458885e603e307c26f706b06dcdd8f8766ff045ae404a8cb197ac1d0ecd1bcdfef3d81a9ee492c371d0aaea4b8048cae6d384')
diff --git a/config b/config
index 104e4ae6c420..5d7e4d9473ad 100644
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.0 Kernel Configuration
+# Linux/x86 6.8.1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20231110"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
@@ -138,6 +138,7 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPTION=y
 CONFIG_PREEMPT_DYNAMIC=y
 CONFIG_SCHED_CORE=y
+# CONFIG_SCHED_CLASS_EXT is not set
 
 #
 # CPU/Task time and stats accounting
@@ -224,6 +225,7 @@ CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_EXT_GROUP_SCHED is not set
 CONFIG_SCHED_MM_CID=y
 CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
@@ -614,6 +616,7 @@ CONFIG_CPU_IBRS_ENTRY=y
 CONFIG_CPU_SRSO=y
 CONFIG_SLS=y
 # CONFIG_GDS_FORCE_MITIGATION is not set
+CONFIG_MITIGATION_RFDS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -6864,7 +6867,6 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMD_DC_FP=y
 CONFIG_DRM_AMD_DC_SI=y
 CONFIG_DRM_AMD_SECURE_DISPLAY=y
-CONFIG_DRM_AMD_COLOR_STEAMDECK=y
 # end of Display Engine Configuration
 
 CONFIG_HSA_AMD=y