commit: f2015c9688ee5f5a6a2727d5edab989e084ff9be Author: Brahmajit Das <listout <AT> listout <DOT> xyz> AuthorDate: Wed Jan 21 13:33:59 2026 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jan 23 07:18:20 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2015c96
sys-kernel/zen-sources: drop 6.18.3, 6.18.4 Signed-off-by: Brahmajit Das <listout <AT> listout.xyz> Part-of: https://github.com/gentoo/gentoo/pull/45469 Closes: https://github.com/gentoo/gentoo/pull/45469 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> sys-kernel/zen-sources/Manifest | 6 -- .../0001-sched-proxy-Yield-the-donor-task.patch | 119 --------------------- sys-kernel/zen-sources/zen-sources-6.18.3.ebuild | 66 ------------ sys-kernel/zen-sources/zen-sources-6.18.4.ebuild | 62 ----------- 4 files changed, 253 deletions(-) diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest index 2ca86b1e6495..892430312104 100644 --- a/sys-kernel/zen-sources/Manifest +++ b/sys-kernel/zen-sources/Manifest @@ -1,13 +1,7 @@ -DIST genpatches-6.18-5.base.tar.xz 333884 BLAKE2B a7b06489d4362d08ae0f8d35eac17713924522b476db65186ec80adc66ce0b68aa68a092b5f630e0548934e493f26a17760d5d9a13ab203932c3db1f0f00c4c7 SHA512 d402223d594e087ccd639bc1506b932b2cf9c2a16f9d50eaf8308372af2e3a2525af1a12e51b37b5148b6b98df3c6b8305cc946dacefbd61d240f866234f9c78 -DIST genpatches-6.18-5.extras.tar.xz 4324 BLAKE2B 885772df3f69a71daac0d08ca4083e37a436818cc7607bbef11011959ba42db6842a42af28f120273dd3706fa219f6aa3873cc07449da004a4d2368e1ba3960a SHA512 0ebd28094d49c5b6c04cb0f8ca67d321bf1df8bf2977751daa7a8eaa1f8a50d4a140226533ea411776b0c3652ff583764f20dbd8d800a9bb363df4b3d183eecc -DIST genpatches-6.18-6.base.tar.xz 422888 BLAKE2B 287bb6eca4d36dbe3f97472fcf293a11b8917a8c5a1a6cb8aba3d158e766054dce3c9cfb819ab71aa28d053dd6a79228d94fdb58f25430d81c58755262f4e2fa SHA512 f7fe4742de1b75967338b2ebbeb04964b68671c28aa65e473a22f0feb7664f1f0c5d3a6b58a1ced3930c166641a3dc0235c952976c7a6cb7c512953968ed8907 -DIST genpatches-6.18-6.extras.tar.xz 4320 BLAKE2B ed59ba735821e97d5df6e09c7c053c75474efcd457fb1ef851abded47c5f75cff4c280d0d5c57f37d58aecdbf30c02db3d38c88a13b0067f674a68a65df04350 SHA512 c1c8b0360ad2bbae27c54edadd4c663691b1454da8afa662d4f974d0206bad3069b4028ae982f95282344e7ba087542b699535f9e1c14bbefb91fe9a79764a60 DIST genpatches-6.18-7.base.tar.xz 425084 BLAKE2B 33f617e4e66db419780887286c6fa5da90e386415d169fbbd0dea8aedabfe21e8b063e8cf6e67431b09cde02751cb2e0695f07bedc6576b900d8f7ff02865a99 SHA512 d41530f4aebf625bd8874033b9019cb40d79e8f3fb639def37cc243b357b68b38c174e0336877729dc5d2aa908ab33addffcbba07d888a0b932182a09f07ef5d DIST genpatches-6.18-7.extras.tar.xz 4324 BLAKE2B b58dd4a5b5fd2edc1262a1086783d74bc523d41a28d5dd6c7519b954a185043e6e4b454cf05a9b2347615ee9c10848f48176604b313805bc9d20d0c12f010db2 SHA512 9e1a807531eec50de5297d48f0da013cf72914139251d91ed25dbe71689db6cadf7bbff081d2fd6fbfcd979439088ee508f6d3257af1393b8469f91f1404460c DIST genpatches-6.18-8.base.tar.xz 477936 BLAKE2B 25b44812e5c3a29f52bc14170f0817eb8de46cd96524049a3c0ea3ab7b6ed0648c1649c623744b7dcb904c23db9d0379cf967a58713b49a7101d86113b25db0c SHA512 58149f6cd2d365809e0a58cec19d60cd136c59ed51dda383edf1869c254ac16daf17528f35becf60669571b28c9af217b6a877c6baab71ed5b58a494cd935c05 DIST genpatches-6.18-8.extras.tar.xz 4320 BLAKE2B c98f3170dc003d1459108f2bf433d0e65dbd4dcd09db03f80997ed9bced8b910925ba7e3ecb858df217906cf9467004f92a0aae22635bfebb1f661dd31b815f9 SHA512 4010692dec60c6d27fac9b620750ea6bc20dbe69953e51df4fa81f30cb561b780a35d4dcc2cd473705f8d028f0f12a9d033858a0e6990b53c3dcc3704d350965 DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0 -DIST linux-v6.18.3-zen1.patch.zst 154027 BLAKE2B cd7c7026515feddc80accdb663da531f10f3c10ac92849ff0039b62d37bd9f826c6dd68841eead353564d4eb592f13f0460b6f6144e3cb42815b7efa5c7b7f51 SHA512 f3663625f35ee55a191384cede415790aa6f484b925f3cee4b40a8598577af68c22748b43d052fc591ecff160985ba36f3ab088c684f1c93f3fbef24981880b0 -DIST linux-v6.18.4-zen1.patch.zst 153160 BLAKE2B 1047d07e2050ab85ac426879c7a936ca08042274729352ed02e476b164b074102b76bc3f30e9ffaaf9cae20c64a047a0169b4c339908649abe7f9ad56395619a SHA512 48d393982a4a8d5c41033dafbf7740c052b35fdea6ae36b10c47330a8cdade69a6451e1b1ea9fecb0c56375e3fccf3ab9ad2ef6c3acadebfaaef91c34c20eecf DIST linux-v6.18.5-zen1.patch.zst 153200 BLAKE2B 7e56be0c5cc96751a8695218d16b4175f69e428c185d51d3024b85912ba028b36847a8074d8816e6ac3191f3d59fd37f96dea106babb27ddf89789774279890f SHA512 dbbf347c1c5bd0ed30c05bef5e3399fde147985a3772bde5ab80b118e1af319321e1ee8405a3291b5f9ff78a9aa4b3b11043c4b502e8d5eaa3b105c452aca178 DIST linux-v6.18.6-zen1.patch.zst 152473 BLAKE2B c18dc894303234546cfe00c9fae22c194e8de190cf9759d7c2be2d033c4f2eb21b0aeb661c941934dc702b92d20ffa709a3a5d72a59713c06f47c3a90a39283c SHA512 e55138b269ab4a69f4a24f7b79727d4c658080344c9e6decc5fc53918e2d232290b57d5c211fbfe81e616009d313a47d914c4afdff600c2eaebc0ca482ff8b78 diff --git a/sys-kernel/zen-sources/files/0001-sched-proxy-Yield-the-donor-task.patch b/sys-kernel/zen-sources/files/0001-sched-proxy-Yield-the-donor-task.patch deleted file mode 100644 index b3437399ea49..000000000000 --- a/sys-kernel/zen-sources/files/0001-sched-proxy-Yield-the-donor-task.patch +++ /dev/null @@ -1,119 +0,0 @@ -From d4ed8eac96348fdf65c285a1b756808581a80a69 Mon Sep 17 00:00:00 2001 -From: Fernand Sieber <[email protected]> -Date: Thu, 6 Nov 2025 12:40:10 +0200 -Subject: [PATCH] sched/proxy: Yield the donor task - -When executing a task in proxy context, handle yields as if they were -requested by the donor task. This matches the traditional PI semantics -of yield() as well. - -This avoids scenario like proxy task yielding, pick next task selecting the -same previous blocked donor, running the proxy task again, etc. - -Reported-by: kernel test robot <[email protected]> -Closes: https://lore.kernel.org/oe-lkp/[email protected] -Suggested-by: Peter Zijlstra <[email protected]> -Signed-off-by: Fernand Sieber <[email protected]> -Signed-off-by: Peter Zijlstra (Intel) <[email protected]> -Link: https://patch.msgid.link/[email protected] -Signed-off-by: Brahmajit Das <[email protected]> ---- - kernel/sched/deadline.c | 2 +- - kernel/sched/ext.c | 4 ++-- - kernel/sched/fair.c | 2 +- - kernel/sched/rt.c | 2 +- - kernel/sched/syscalls.c | 5 +++-- - 5 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c -index 19b1a8b81c76..d3be71d5a9cc 100644 ---- a/kernel/sched/deadline.c -+++ b/kernel/sched/deadline.c -@@ -2143,7 +2143,7 @@ static void yield_task_dl(struct rq *rq) - * it and the bandwidth timer will wake it up and will give it - * new scheduling parameters (thanks to dl_yielded=1). - */ -- rq->curr->dl.dl_yielded = 1; -+ rq->donor->dl.dl_yielded = 1; - - update_rq_clock(rq); - update_curr_dl(rq); -diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c -index b959a70471c1..907eea83294c 100644 ---- a/kernel/sched/ext.c -+++ b/kernel/sched/ext.c -@@ -1493,7 +1493,7 @@ static bool dequeue_task_scx(struct rq *rq, struct task_struct *p, int deq_flags - static void yield_task_scx(struct rq *rq) - { - struct scx_sched *sch = scx_root; -- struct task_struct *p = rq->curr; -+ struct task_struct *p = rq->donor; - - if (SCX_HAS_OP(sch, yield)) - SCX_CALL_OP_2TASKS_RET(sch, SCX_KF_REST, yield, rq, p, NULL); -@@ -1504,7 +1504,7 @@ static void yield_task_scx(struct rq *rq) - static bool yield_to_task_scx(struct rq *rq, struct task_struct *to) - { - struct scx_sched *sch = scx_root; -- struct task_struct *from = rq->curr; -+ struct task_struct *from = rq->donor; - - if (SCX_HAS_OP(sch, yield)) - return SCX_CALL_OP_2TASKS_RET(sch, SCX_KF_REST, yield, rq, -diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index d30dfd6f18b7..99a10815ca17 100644 ---- a/kernel/sched/fair.c -+++ b/kernel/sched/fair.c -@@ -9006,7 +9006,7 @@ static void put_prev_task_fair(struct rq *rq, struct task_struct *prev, struct t - */ - static void yield_task_fair(struct rq *rq) - { -- struct task_struct *curr = rq->curr; -+ struct task_struct *curr = rq->donor; - struct cfs_rq *cfs_rq = task_cfs_rq(curr); - struct sched_entity *se = &curr->se; - -diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c -index 7936d4333731..fb07dcfc60a2 100644 ---- a/kernel/sched/rt.c -+++ b/kernel/sched/rt.c -@@ -1490,7 +1490,7 @@ static void requeue_task_rt(struct rq *rq, struct task_struct *p, int head) - - static void yield_task_rt(struct rq *rq) - { -- requeue_task_rt(rq, rq->curr, 0); -+ requeue_task_rt(rq, rq->donor, 0); - } - - static int find_lowest_rq(struct task_struct *task); -diff --git a/kernel/sched/syscalls.c b/kernel/sched/syscalls.c -index a2b06eba44e7..417eb6a63015 100644 ---- a/kernel/sched/syscalls.c -+++ b/kernel/sched/syscalls.c -@@ -1607,7 +1607,7 @@ static void do_sched_yield(void) - rq = this_rq_lock_irq(&rf); - - schedstat_inc(rq->yld_count); -- current->sched_class->yield_task(rq); -+ rq->donor->sched_class->yield_task(rq); - #endif /* !CONFIG_SCHED_ALT */ - - preempt_disable(); -@@ -1680,12 +1680,13 @@ int __sched yield_to(struct task_struct *p, bool preempt) - #ifdef CONFIG_SCHED_ALT - return 0; - #else /* !CONFIG_SCHED_ALT */ -- struct task_struct *curr = current; -+ struct task_struct *curr; - struct rq *rq, *p_rq; - int yielded = 0; - - scoped_guard (raw_spinlock_irqsave, &p->pi_lock) { - rq = this_rq(); -+ curr = rq->donor; - - again: - p_rq = task_rq(p); --- -2.52.0 - diff --git a/sys-kernel/zen-sources/zen-sources-6.18.3.ebuild b/sys-kernel/zen-sources/zen-sources-6.18.3.ebuild deleted file mode 100644 index ee11fdc4a930..000000000000 --- a/sys-kernel/zen-sources/zen-sources-6.18.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="5" -K_SECURITY_UNSUPPORTED="1" -K_NOSETEXTRAVERSION="1" -K_NODRYRUN="yes" - -inherit kernel-2 unpacker -detect_version -detect_arch - -DESCRIPTION="The Zen Kernel Live Sources" -HOMEPAGE="https://github.com/zen-kernel"; - -# Needed for zstd compression of the patch -BDEPEND="$(unpacker_src_uri_depends)" - -ZEN_VER=1 -ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen${ZEN_VER}/linux-v${PV}-zen${ZEN_VER}.patch.zst"; -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}" - -KEYWORDS="~amd64 ~arm64 ~x86" - -PATCHES=( - "${FILESDIR}/0001-sched-proxy-Yield-the-donor-task.patch" -) - -UNIPATCH_LIST="${WORKDIR}/linux-v${PV}-zen${ZEN_VER}.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_EXCLUDE="1810 2701" - -K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \ -${HOMEPAGE}, also go to #zen-sources on oftc" - -src_unpack() { - unpacker "linux-v${PV}-zen${ZEN_VER}.patch.zst" - kernel-2_src_unpack -} - -pkg_setup() { - ewarn - ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." - ewarn "If you need support, please contact the zen developers directly." - ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" - ewarn "the ebuilds. Thank you." - ewarn - kernel-2_pkg_setup -} - -src_prepare() { - default - kernel-2_src_prepare -} - -src_install() { - rm "${WORKDIR}/linux-v${PV}-zen${ZEN_VER}.patch" || die - kernel-2_src_install -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/zen-sources/zen-sources-6.18.4.ebuild b/sys-kernel/zen-sources/zen-sources-6.18.4.ebuild deleted file mode 100644 index 725c2ee06c67..000000000000 --- a/sys-kernel/zen-sources/zen-sources-6.18.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="6" -K_SECURITY_UNSUPPORTED="1" -K_NOSETEXTRAVERSION="1" -K_NODRYRUN="yes" - -inherit kernel-2 unpacker -detect_version -detect_arch - -DESCRIPTION="The Zen Kernel Live Sources" -HOMEPAGE="https://github.com/zen-kernel"; - -# Needed for zstd compression of the patch -BDEPEND="$(unpacker_src_uri_depends)" - -ZEN_VER=1 -ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen${ZEN_VER}/linux-v${PV}-zen${ZEN_VER}.patch.zst"; -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}" - -KEYWORDS="~amd64 ~arm64 ~x86" - -UNIPATCH_LIST="${WORKDIR}/linux-v${PV}-zen${ZEN_VER}.patch" -UNIPATCH_STRICTORDER="yes" -UNIPATCH_EXCLUDE="1810 2701" - -K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \ -${HOMEPAGE}, also go to #zen-sources on oftc" - -src_unpack() { - unpacker "linux-v${PV}-zen${ZEN_VER}.patch.zst" - kernel-2_src_unpack -} - -pkg_setup() { - ewarn - ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way." - ewarn "If you need support, please contact the zen developers directly." - ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with" - ewarn "the ebuilds. Thank you." - ewarn - kernel-2_pkg_setup -} - -src_prepare() { - default - kernel-2_src_prepare -} - -src_install() { - rm "${WORKDIR}/linux-v${PV}-zen${ZEN_VER}.patch" || die - kernel-2_src_install -} - -pkg_postrm() { - kernel-2_pkg_postrm -}
