]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c0008a5 55ed11b)
sched_ext: Merge branch 'for-6.17-fixes' into for-6.18
authorTejun Heo <tj@kernel.org>
Tue, 23 Sep 2025 19:10:20 +0000 (09:10 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 23 Sep 2025 19:10:20 +0000 (09:10 -1000)
commitebfd5226ec365d0901d3ddee4aba9c737137645c
tree32957e60df4967a5afa6af7e642aeb2077414064tree | snapshot
parentc0008a5632103eae31302e83d012e2d3b0cfad41commit | diff
parent55ed11b181c43d81ce03b50209e4e7c4a14ba099commit | diff
sched_ext: Merge branch 'for-6.17-fixes' into for-6.18

Pull sched_ext/for-6.17-fixes to receive:

 55ed11b181c4 ("sched_ext: idle: Handle migration-disabled tasks in BPF code")

which conflicts with the following commit in for-6.18:

 2407bae23d1e ("sched_ext: Add the @sch parameter to ext_idle helpers")

The conflict is a simple context conflict which can be resolved by taking
the updated parts from both commits.

Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/ext.c diff1 | diff2 | blob | history
kernel/sched/ext_idle.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository