stable: Update to 6.12 #329
Conversation
| eevdf) ## 6.12 EEVDF patches | ||
| source+=("${_patchsource}/sched/0001-eevdf-next.patch");; | ||
| rt) ## EEVDF with RT patches | ||
| source+=("${_patchsource}/misc/0001-rt.patch");; |
There was a problem hiding this comment.
It should be not required anymore, since it got enabled in upstream. If we want to have latest RT features, from the rt tree, then we can keep it, but it also brings more maintenance work
There was a problem hiding this comment.
The commit of removing RT dependency on CONFIG_EXPERT can also be cherrypicked to, e.g cachy.patch
There was a problem hiding this comment.
https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git/log/?h=linux-6.12.y-rt-rebase This is the latest tree of the rt patchset. Initial thoughts are patch 1-3, 6-9 seem nice to have
There was a problem hiding this comment.
It should be not required anymore, since it got enabled in upstream. If we want to have latest RT features, from the rt tree, then we can keep it, but it also brings more maintenance work
From the remaining patches, we don't need the ARM/PowerPC/RISCV specific ones too much since we're not targeting them, but PREEMPT_LAZY and i915 patches are also here. The first one we'll want to have anyway for all kernels, but the second one can be separated into a single patch.
There was a problem hiding this comment.
https://github.com/CachyOS/linux/commits/6.12/rt I've cherrypicked some patches from the rt patchset. This seems to meet the standard expectations of being part of our base patchset. The first two commits is also beneficial for normal kernels, and splitting these into different patches makes no sense in my eyes. The other commits are relatively safe to include for non-RT kernels.
@ptr1337 what do you think?
|
|
sched-ext has finally been merged in 6.12. There is no longer any reason to use this kernel. For comparisons between cachy's patched EEVDF, consider `linux-cachyos-eevdf`. For stock EEVDF, consider `linux-cachyos-server`. Signed-off-by: Eric Naim <[email protected]>
Sync changes from `linux-cachyos-rc/PKGBUILD` to all stable kernel PKGBUILDs where applicable. Signed-off-by: Eric Naim <[email protected]>
This should differentiate it from linux-cachyos-bore Signed-off-by: Eric Naim <[email protected]>
Minor tweaks to the switch cases and comments. Signed-off-by: Eric Naim <[email protected]>
Minor tweaks to the switch cases and comments. Signed-off-by: Eric Naim <[email protected]>
Signed-off-by: Peter Jung <[email protected]>
Signed-off-by: Peter Jung <[email protected]>
Signed-off-by: Peter Jung <[email protected]>
PREEMPT_AUTO was part of the out of tree realtime patchset and isn't included in the mainline kernel. The latest revision of the realtime patchset has also dropped PREEMPT_AUTO (it lacked documentation, I'm not sure what it's really for). Signed-off-by: Eric Naim <[email protected]>
Signed-off-by: Peter Jung <[email protected]>
We don't need `bore-cachy-rt` anymore. This can be reverted if we want to pull out of tree rt patches *only* for the rt kernel, however I much prefer including the rt patchset thats from https://github.com/CachyOS/linux/tree/6.12/rt as one of our base patchsets instead. Signed-off-by: Eric Naim <[email protected]>
Signed-off-by: Eric Naim <[email protected]>
There was a problem hiding this comment.
It looks OK to me, but with one comment: maybe we would leave the sched-ext kernel and add a patch to it https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git/ because I think @htejun might be interested in that.
There was a problem hiding this comment.
diff --git a/linux-cachyos/PKGBUILD b/linux-cachyos/PKGBUILD
index 3ee2b5ff..6e01b3b3 100644
--- a/linux-cachyos/PKGBUILD
+++ b/linux-cachyos/PKGBUILD
@@ -242,13 +242,12 @@ fi
## List of CachyOS schedulers
case "$_cpusched" in
- cachyos|bore|rt-bore) # CachyOS Scheduler (BORE)
- source+=("${_patchsource}/sched/0001-bore-cachy.patch");;
+ cachyos|bore|rt-bore|hardened) # CachyOS Scheduler (BORE)
+ source+=("${_patchsource}/sched/0001-bore-cachy.patch");;&
bmq) ## Project C Scheduler
source+=("${_patchsource}/sched/0001-prjc-cachy.patch");;
- hardened) ## Hardened Patches with BORE Scheduler
- source+=("${_patchsource}/sched/0001-bore-cachy.patch"
- "${_patchsource}/misc/0001-hardened.patch");;
+ hardened) ## Hardened Patches
+ source+=("${_patchsource}/misc/0001-hardened.patch");;
esac
export KBUILD_BUILD_HOST=cachyosThis makes it possible to merge `hardened` with the other options that source BORE (cachyos, bore, rt-bore) while also keeping a separate pattern that sources the hardened patchset. Signed-off-by: Eric Naim <[email protected]>
Yep, was planning on updating .SRCINFO when Pete synced the patches. All the individual trees should merge fine on a clean 6.12 tree, but IDK which patches are going to be included and which are not, so I'd rather wait. edit: It would have failed even if .SRCINFO was updated because the base patch doesn't apply. |
Signed-off-by: Eric Naim <[email protected]>
Signed-off-by: Peter Jung <[email protected]>
|
Pushed with 503f483 |
6.12 will be released in approx. 3 days, this is the branch that will prepare our PKGBUILDs for that kernel version, as it seems that 6.12 is quite a big release.
Changes in patchset from 6.11 to 6.12:
Honorable Mentions:
PKGBUILD Changes:
linux-cachyos-sched-ext- sched-ext is upstream now!linux-cachyos-rc/PKGBUILDto the stable kernel PKGBUILDsSome considerations to be made:
linux-cachyos-rt-bore: Use PREEMPT_RT instead of PREEMPT_AUTO- We got no choice, PREEMPT_AUTO isn't a thing anymore