]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f0714a 9360dfe)
sched_ext: Merge branch 'for-6.14-fixes' into for-6.15
authorTejun Heo <tj@kernel.org>
Mon, 3 Mar 2025 18:02:22 +0000 (08:02 -1000)
committerTejun Heo <tj@kernel.org>
Mon, 3 Mar 2025 18:02:22 +0000 (08:02 -1000)
commit8a9b1585e2bf2a4d335774c893f5e80cf9262b6d
treee3060de9a1fbf406d8f4caf27ca54d431910d7e2tree
parent0f0714a3449ca43671c6aa4cae852c4dfceef0d0commit | diff
parent9360dfe4cbd62ff1eb8217b815964931523b75b3commit | diff
sched_ext: Merge branch 'for-6.14-fixes' into for-6.15

Pull for-6.14-fixes to receive:

  9360dfe4cbd6 ("sched_ext: Validate prev_cpu in scx_bpf_select_cpu_dfl()")

which conflicts with:

  337d1b354a29 ("sched_ext: Move built-in idle CPU selection policy to a separate file")

Signed-off-by: Tejun Heo <tj@kernel.org>
kernel/sched/ext.c diff1 | diff2 | blob | history
kernel/sched/ext_idle.c diff1 | | blob | history
tools/sched_ext/include/scx/common.bpf.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.