From 9a4e6ca71e766da9f9c76f7cfa46a83f9661916c Mon Sep 17 00:00:00 2001
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
Date: Thu, 10 Aug 2023 21:59:39 +0200
Subject: [PATCH] Sync with CachyOS

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
---
 PKGBUILD | 12 ++++++------
 config   |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index ad08196..57f1d6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -178,7 +178,7 @@ _stable=${_major}.${_minor}
 _srcname=linux-${_stable}
 #_srcname=linux-${_major}
 pkgdesc='Linux EEVDF-BORE scheduler 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"
@@ -200,7 +200,7 @@ source=(
     "https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz"
     "config"
     "auto-cpu-optimization.sh"
-    "${_patchsource}/all/0001-cachyos-base-all.patch")
+    "${_patchsource}/all/0001-cachyos-base-all-dev.patch")
 
 # ZFS support
 if [ -n "$_build_zfs" ]; then
@@ -286,10 +286,10 @@ prepare() {
         "${srcdir}"/auto-cpu-optimization.sh
     fi
 
-    ### Disabling CONFIG_CPU_SRSO
+    ### Disabling CONFIG_CPU_SRSO for LTO kernel
     # More infos here: https://github.com/CachyOS/linux-cachyos/issues/150
     if [ "$_use_llvm_lto" != "none" ]; then
-        echo "Disabling CONFIG_CPU_SRSO..."
+        echo "Disabling CONFIG_CPU_SRSO for LTO kernel..."
         scripts/config -d CPU_SRSO
     fi
 
@@ -797,8 +797,8 @@ for _p in "${pkgname[@]}"; do
 done
 
 b2sums=('87a05cae7d5dca89921801f69467ec01a871941f5dd1bd956bc9f13c4786b35a141811808b36e45471ee3bbe15d669d7114257759f3e5893d17ca38e40ebdc4b'
-        '846bb768495e38acc46c6777f5d15329d2f033968b9380fe5966b52aefc35b098ce57b9d2ab606294b4f675b53def2989e566d4d3ee4a5d68bcd818a9c7fb1af'
+        'f86d5bc428a0a3213b186fc16e05779256f243b097b37e69af10b4cce29a9fbcd5b4458b057a86a9aaf12659da7c44df711844cb3beda3f995aa2c2fe7435f17'
         '11d2003b7d71258c4ca71d71c6b388f00fe9a2ddddc0270e304148396dadfd787a6cac1363934f37d0bfb098c7f5851a02ecb770e9663ffe57ff60746d532bd0'
-        '9961361f254d189f3b3bffa1276d19e4a1ba8f10454c247582469ee60ca3591f16f709ad1c51d60dafb799c5370f5d6818a5978264903e6517499cf3527aa04b'
+        '1efda7a89a298b3c4a697fab1c21ab306c1e1f6d173c2726d294b3e9bf6d3c431a45f0e8308484d96aed8364756b71e3da6dc4506b40f32a6c92538a3f675481'
         '11d5923512051c46477aab7ceddaa1fef962c8d503975e34e660acb1a9c7040b147a935ca3f6f5f7e5cadb37e32a1cd25ddd8fda00c403d6364f9612ceebdc1f'
         '893d96b3f582a753cd9821ee78028ef923fbf1c46f45c1c26f76ec02715ae89cdd536c1ebf95d54fb4d4ef4da4f1560f6e6136fd528489f703e41950c03a6dc3')
diff --git a/config b/config
index c74330d..b3c0834 100644
--- a/config
+++ b/config
@@ -2,14 +2,14 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86 6.4.9 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230525"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230730"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=130101
+CONFIG_GCC_VERSION=130201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24000
+CONFIG_AS_VERSION=24100
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24000
+CONFIG_LD_VERSION=24100
 CONFIG_LLD_VERSION=0
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_CC_CAN_LINK=y
@@ -729,6 +729,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_AMD_PSTATE=y
+CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=3
 CONFIG_X86_AMD_PSTATE_UT=m
 CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ_CPB=y