]> www.infradead.org Git - users/dwmw2/linux.git/commit
Merge branch 'for-6.15-fixes' into for-6.16
authorTejun Heo <tj@kernel.org>
Tue, 22 Apr 2025 19:29:23 +0000 (09:29 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 22 Apr 2025 19:29:44 +0000 (09:29 -1000)
commitac47c272b2668cd28e22b58921f3fd2b9daae2c7
tree5b9f55f9926bb71ebdb0e83c7ef88c41936e0d9e
parent69120f8228297715e0d1d40d2f636ebbff60b543
parenta11d6784d7316a6c77ca9f14fb1a698ebbb3c1fb
Merge branch 'for-6.15-fixes' into for-6.16

a11d6784d731 ("sched_ext: Fix missing rq lock in scx_bpf_cpuperf_set()")
added a call to scx_ops_error() which was renamed to scx_error() in
for-6.16. Fix it up.
kernel/sched/ext.c
kernel/sched/ext_idle.c