Bump to 6.1.1

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

3 files changed, 26 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adb89b4c212b..22b899c0abf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-cachyos
 	pkgdesc = Linux BORE scheduler Kernel by CachyOS with other patches and improvements
-	pkgver = 6.1.0
-	pkgrel = 2
+	pkgver = 6.1.1
+	pkgrel = 1
 	url = https://github.com/CachyOS/linux-cachyos
 	arch = x86_64
 	arch = x86_64_v3
@@ -21,18 +21,18 @@ pkgbase = linux-cachyos
 	makedepends = make
 	makedepends = patch
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.1.tar.xz
 	source = config
 	source = auto-cpu-optimization.sh
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/all/0001-cachyos-base-all.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/misc/0001-Add-latency-priority-for-CFS-class.patch
 	source = https://raw.githubusercontent.com/cachyos/kernel-patches/master/6.1/sched/0001-bore-cachy.patch
-	sha256sums = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
-	sha256sums = 28832ea41f4429260f4b1a355f89a2bda1332d3893b42b349897d4661ffc3d96
+	sha256sums = a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb
+	sha256sums = c9c662d6adbf5a4bfeee3cabab6eafe7b9a2d2d51532df2bd53df1c61b6d5260
 	sha256sums = 32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74
-	sha256sums = 1638f816f56bb0989e71848b906c229aa0db2f08d482a5d52ad05761677d6dc5
+	sha256sums = 5ecf5d28265339ee4372792ce86c08b8d4622aeac4f40a94647213a427157bcd
 	sha256sums = 7b3c12a19efe84f023bd64f0c984c73b0ec7a73c78cba96b5f92c5263ed2a46f
-	sha256sums = e74a2454da0b83435a95fa3c5d13b104e87c5003abcb1291fe055aa4d340e0ae
+	sha256sums = 26b1cc77c882132aebaa09c4da11280f85bc85f74fd989975064090bb680aa86
 
 pkgname = linux-cachyos
 	pkgdesc = The Linux BORE scheduler Kernel by CachyOS with other patches and improvements kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index ca633b51b7f9..0b7ae6d94183 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -75,7 +75,7 @@ _per_gov=${_per_gov-y}
 _tcp_bbr2=${_tcp_bbr2-y}
 
 ### Running with a 1000HZ, 750Hz, 600 Hz, 500Hz, 300Hz, 250Hz and 100Hz tick rate
-_HZ_ticks=${_HZ_ticks-750}
+_HZ_ticks=${_HZ_ticks-500}
 
 ## Choose between perodic, idle or full
 ### Full tickless can give higher performances in various cases but, depending on hardware, lower consistency.
@@ -185,17 +185,17 @@ else
     pkgbase=linux-$pkgsuffix
 fi
 _major=6.1
-_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}
 pkgdesc='Linux BORE scheduler Kernel by CachyOS with other patches and improvements'
-pkgrel=2
+pkgrel=1
 _kernver=$pkgver-$pkgrel
 arch=('x86_64' 'x86_64_v3')
 url="https://github.com/CachyOS/linux-cachyos"
@@ -263,13 +263,11 @@ if [ "$_cpusched" = "tt" ]; then
 fi
 ## Hardened Patches with BORE Scheduler
 if [ "$_cpusched" = "hardened" ]; then
-    source+=("${_patchsource}/sched/0001-bore.patch"
+    source+=("${_patchsource}/sched/0001-bore-cachy.patch"
          "${_patchsource}/misc/0001-hardened.patch")
 fi
 ## Kernel CFI Patch
 if [ -n "$_use_kcfi" ]; then
-    source+=("${_patchsource}/misc/0001-kcfi.patch")
-    depends+=(llvm-git llvm-libs-git python)
     BUILD_FLAGS=(
         CC=clang
         LD=ld.lld
@@ -990,9 +988,9 @@ for _p in "${pkgname[@]}"; do
     }"
 done
 
-sha256sums=('2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb'
-            '28832ea41f4429260f4b1a355f89a2bda1332d3893b42b349897d4661ffc3d96'
+sha256sums=('a3e61377cf4435a9e2966b409a37a1056f6aaa59e561add9125a88e3c0971dfb'
+            'c9c662d6adbf5a4bfeee3cabab6eafe7b9a2d2d51532df2bd53df1c61b6d5260'
             '32e77b3b71225c9f04df2d44c25f982773a8fff9927d26788366baab5e242e74'
-            '1638f816f56bb0989e71848b906c229aa0db2f08d482a5d52ad05761677d6dc5'
+            '5ecf5d28265339ee4372792ce86c08b8d4622aeac4f40a94647213a427157bcd'
             '7b3c12a19efe84f023bd64f0c984c73b0ec7a73c78cba96b5f92c5263ed2a46f'
-            'e74a2454da0b83435a95fa3c5d13b104e87c5003abcb1291fe055aa4d340e0ae')
+            '26b1cc77c882132aebaa09c4da11280f85bc85f74fd989975064090bb680aa86')
diff --git a/config b/config
index b2f2cadea3ae..5fca6e02439e 100644
--- a/config
+++ b/config
@@ -418,6 +418,7 @@ CONFIG_INTEL_TDX_GUEST=y
 # CONFIG_MZEN is not set
 # CONFIG_MZEN2 is not set
 # CONFIG_MZEN3 is not set
+# CONFIG_MZEN4 is not set
 # CONFIG_MPSC is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
@@ -440,6 +441,8 @@ CONFIG_INTEL_TDX_GUEST=y
 # CONFIG_MSAPPHIRERAPIDS is not set
 # CONFIG_MROCKETLAKE is not set
 # CONFIG_MALDERLAKE is not set
+# CONFIG_MRAPTORLAKE is not set
+# CONFIG_MMETEORLAKE is not set
 CONFIG_GENERIC_CPU=y
 # CONFIG_GENERIC_CPU2 is not set
 # CONFIG_GENERIC_CPU3 is not set
@@ -875,6 +878,7 @@ CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_LTO=y
+CONFIG_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
 CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
 CONFIG_ARCH_SUPPORTS_LTO_GCC=y
@@ -885,6 +889,9 @@ CONFIG_LTO_NONE=y
 # CONFIG_LTO_GCC is not set
 # CONFIG_LTO_CP_CLONE is not set
 CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
+CONFIG_ARCH_USES_CFI_TRAPS=y
+# CONFIG_CFI_CLANG is not set
+# CONFIG_CFI_PERMISSIVE is not set
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER=y
 CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y
@@ -10518,6 +10525,7 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 # CONFIG_ZERO_CALL_USED_REGS is not set
 # end of Memory initialization
 
+CONFIG_CC_HAS_RANDSTRUCT=y
 CONFIG_RANDSTRUCT_NONE=y
 # CONFIG_RANDSTRUCT_FULL is not set
 # CONFIG_RANDSTRUCT_PERFORMANCE is not set
@@ -11015,6 +11023,7 @@ CONFIG_DEBUG_INFO_DWARF5=y
 # CONFIG_DEBUG_INFO_REDUCED is not set
 CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
 # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
 # CONFIG_DEBUG_INFO_SPLIT is not set
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_PAHOLE_HAS_SPLIT_BTF=y