Bump to 6.9-rc2

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

3 files changed, 30 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81fb76f924d4..e680b664aff7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-cachyos-rc
 	pkgdesc = Linux SCHED-EXT + Cachy Sauce Kernel by CachyOS with other patches and improvements
-	pkgver = 6.9.rc1
+	pkgver = 6.9.rc2
 	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
@@ -24,16 +24,18 @@ pkgbase = linux-cachyos-rc
 	depends = scx-scheds
 	options = !strip
 	options = !debug
-	source = https://github.com/torvalds/linux/archive/refs/tags/v6.9-rc1.tar.gz
+	source = https://github.com/torvalds/linux/archive/refs/tags/v6.9-rc2.tar.gz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.9/all/0001-cachyos-base-all.patch
-	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.9/sched/0001-bore-cachy.patch
-	b2sums = 809f4c010ce6dd1e1033e0b73e465b8303814797397754a21d98bb7423f2ab73c523c106f205fbd3f9bb0856ee5e96a259a03f3cea02d81957c60d92536eae39
-	b2sums = 084447bcbc1429f4fd7a213ff777f480a1dfa95c3c5aec940226048f07a7c543cf2af08bd0a051a689479840c22fb5db2ddc7381ad592566b9cfe7a16c4b4590
+	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.9/sched/0001-sched-ext.patch
+	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.9/sched/0001-bore-cachy-ext.patch
+	b2sums = 90482b9959d96050cdc18dc7ab86833c7e0f38483e98c59cc0c1a2bc9fccb536296ac91e14793e2ac40a6e8cb4f010d043bf910377acf7a63068dcb8e7c71bf7
+	b2sums = f93a194dfa71d19f04e30fe2abbe681563afd99fa7bcb8f9e2e12e4b84fdf460f873c8d6f1d9ca1370c16e20dfd55aa1e0298972a829dcf6083f3a0b5127ff9c
 	b2sums = 43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d
-	b2sums = 3c736ed35ed166c2606540b45d3c0d0616baf8280595c7222c51d691c973f891aab73436cdb71e7ae8242c3bd4a8d25429f3807cf5263e19a425cd0d23b22f61
-	b2sums = d7cbdec7da9edd4ff1d373b34041a867f651433cb01aac8633d72fed8d7042ae715494697292c2a0b0fd6562f89f46cf5778c45a6e69cf5d2b2fe132580aa15a
+	b2sums = 2217d97016d2d1ab2a5cdf0a6680328a2f8d8faf9bb954d542df664684f50a67777f062825eee6a20aeae249043ebdb6bd62d4804dff4953fc82e4d3bc3e293f
+	b2sums = b0c5d00c25922e1a11911855a65b98997be7e4911e608d34e9be2ded4d241331e6dadf05c3f71db11aacf4db81f2c4dff9222f2a7499a8e2b8b65df7706fee0f
+	b2sums = 2878d8388184ffb0bbaae9ef3516702f20d54d202e29fea5d56c994094dc464946ef6c0d2f97d954c1186bfe32ea716188393634b37269aed8f0d01d0af60ec9
 
 pkgname = linux-cachyos-rc
 	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 968625ee0234..7c9251931e74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,7 +71,7 @@ _per_gov=${_per_gov-}
 ### Enable TCP_CONG_BBR3
 _tcp_bbr3=${_tcp_bbr3-y}
 
-### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
+### Running with a 1000HZ, 750Hz, 625Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
 _HZ_ticks=${_HZ_ticks-1000}
 
 ## Choose between perodic, idle or full
@@ -158,9 +158,9 @@ elif [ -n "$_use_llvm_lto" ]  ||  [[ "$_use_lto_suffix" = "n" ]]; then
     pkgbase=linux-$pkgsuffix
 fi
 _major=6.9
-_minor=1
+_minor=0
 #_minorc=$((_minor+1))
-_rcver=rc1
+_rcver=rc2
 pkgver=${_major}.${_rcver}
 #_stable=${_major}.${_minor}
 #_stable=${_major}
@@ -207,7 +207,7 @@ fi
 # ZFS support
 if [ -n "$_build_zfs" ]; then
     makedepends+=(git)
-    source+=("git+https://github.com/cachyos/zfs.git#commit=c883088df83ced3a2b8b38e6d89a5e63fb153ee4")
+    source+=("git+https://github.com/cachyos/zfs.git#commit=228ff3867f53d31dab403a3b6b3b555eaf8bdc04")
 fi
 
 # NVIDIA pre-build module support
@@ -218,9 +218,12 @@ fi
 ## List of CachyOS schedulers
 case "$_cpusched" in
     cachyos) ## SCHED-EXT
-        source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
+        source+=("${_patchsource}/sched/0001-sched-ext.patch"
+                 "${_patchsource}/sched/0001-bore-cachy-ext.patch");;
     bore) ## BORE Scheduler
         source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
+    echo) ## ECHO Scheduler
+        source+=("${_patchsource}/sched/0001-echo-cachy.patch");;
     rt) ## EEVDF with RT patches
         source+=("${_patchsource}/misc/0001-rt.patch"
                  linux-cachyos-rt.install);;
@@ -285,8 +288,10 @@ prepare() {
     [ -z "$_cpusched" ] && _die "The value is empty. Choose the correct one again."
 
     case "$_cpusched" in
+        cachyos) scripts/config -e SCHED_BORE -e SCHED_CLASS_EXT;;
         sched-ext) scripts/config -e SCHED_CLASS_EXT;;
         bore|hardened|cachyos) scripts/config -e SCHED_BORE;;
+        echo) scripts/config -e ECHO_SCHED;;
         eevdf) ;;
         rt) scripts/config -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
         rt-bore) scripts/config -e SCHED_BORE -e PREEMPT_COUNT -e PREEMPTION -d PREEMPT_VOLUNTARY -d PREEMPT -d PREEMPT_NONE -e PREEMPT_RT -d PREEMPT_DYNAMIC -d PREEMPT_BUILD;;
@@ -318,7 +323,7 @@ prepare() {
     [ -z $_HZ_ticks ] && _die "The value is empty. Choose the correct one again."
 
     case "$_HZ_ticks" in
-        100|250|500|600|750|1000)
+        100|250|500|600|625|750|1000)
             scripts/config -d HZ_300 -e "HZ_${_HZ_ticks}" --set-val HZ "${_HZ_ticks}";;
         300)
             scripts/config -e HZ_300 --set-val HZ 300;;
@@ -711,8 +716,9 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-b2sums=('809f4c010ce6dd1e1033e0b73e465b8303814797397754a21d98bb7423f2ab73c523c106f205fbd3f9bb0856ee5e96a259a03f3cea02d81957c60d92536eae39'
-        '084447bcbc1429f4fd7a213ff777f480a1dfa95c3c5aec940226048f07a7c543cf2af08bd0a051a689479840c22fb5db2ddc7381ad592566b9cfe7a16c4b4590'
+b2sums=('90482b9959d96050cdc18dc7ab86833c7e0f38483e98c59cc0c1a2bc9fccb536296ac91e14793e2ac40a6e8cb4f010d043bf910377acf7a63068dcb8e7c71bf7'
+        'f93a194dfa71d19f04e30fe2abbe681563afd99fa7bcb8f9e2e12e4b84fdf460f873c8d6f1d9ca1370c16e20dfd55aa1e0298972a829dcf6083f3a0b5127ff9c'
         '43ef7a347878592740d9eb23b40a56083fa747f7700fa1e2c6d039d660c0b876d99bf1a3160e15d041fb13d45906cdb5defef034d4d0ae429911864239c94d8d'
-        '3c736ed35ed166c2606540b45d3c0d0616baf8280595c7222c51d691c973f891aab73436cdb71e7ae8242c3bd4a8d25429f3807cf5263e19a425cd0d23b22f61'
-        'd7cbdec7da9edd4ff1d373b34041a867f651433cb01aac8633d72fed8d7042ae715494697292c2a0b0fd6562f89f46cf5778c45a6e69cf5d2b2fe132580aa15a')
+        '2217d97016d2d1ab2a5cdf0a6680328a2f8d8faf9bb954d542df664684f50a67777f062825eee6a20aeae249043ebdb6bd62d4804dff4953fc82e4d3bc3e293f'
+        'b0c5d00c25922e1a11911855a65b98997be7e4911e608d34e9be2ded4d241331e6dadf05c3f71db11aacf4db81f2c4dff9222f2a7499a8e2b8b65df7706fee0f'
+        '2878d8388184ffb0bbaae9ef3516702f20d54d202e29fea5d56c994094dc464946ef6c0d2f97d954c1186bfe32ea716188393634b37269aed8f0d01d0af60ec9')
diff --git a/config b/config
index 57cc979cf1e1..96f0f53d16be 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.9.0-rc1 Kernel Configuration
+# Linux/x86 6.9.0-rc2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
 CONFIG_CC_IS_GCC=y
@@ -24,6 +24,7 @@ CONFIG_PAHOLE_VERSION=126
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
+# CONFIG_ECHO_SCHED is not set
 
 #
 # General setup
@@ -563,6 +564,7 @@ CONFIG_HZ_300=y
 # CONFIG_HZ_500 is not set
 # CONFIG_HZ_600 is not set
 # CONFIG_HZ_750 is not set
+# CONFIG_HZ_625 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
@@ -1034,6 +1036,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
 CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
 # CONFIG_MODULE_SIG_SHA256 is not set
 # CONFIG_MODULE_SIG_SHA384 is not set
 CONFIG_MODULE_SIG_SHA512=y
@@ -2338,7 +2341,6 @@ CONFIG_CXL_PORT=m
 CONFIG_CXL_SUSPEND=y
 CONFIG_CXL_REGION=y
 # CONFIG_CXL_REGION_INVALIDATION_TEST is not set
-CONFIG_CXL_PMU=m
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -10348,6 +10350,7 @@ CONFIG_MCB_LPC=m
 # Performance monitor support
 #
 CONFIG_DWC_PCIE_PMU=m
+CONFIG_CXL_PMU=m
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -11830,8 +11833,6 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_ATOMIC64_SELFTEST is not set
 CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_HEXDUMP is not set
-# CONFIG_STRING_SELFTEST is not set
-# CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_SCANF is not set