]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 01d541b bc08b15)
sched_ext: Merge branch 'for-6.15-fixes' into for-6.16
authorTejun Heo <tj@kernel.org>
Tue, 8 Apr 2025 18:56:57 +0000 (08:56 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 8 Apr 2025 18:56:57 +0000 (08:56 -1000)
commit294f5ff47405f920d85b8d411ddbc52ed708a423
treeaea5007d8a9ab3642a2a9f7c2575184db4f91d1btree
parent01d541baedd74530831c8c98b946622cb7487f30commit | diff
parentbc08b15b54b8aadbc8a8f413271c07a3f4bead87commit | diff
sched_ext: Merge branch 'for-6.15-fixes' into for-6.16

Pull for-6.15-fixes to receive:

 e776b26e3701 ("sched_ext: Remove cpu.weight / cpu.idle unimplemented warnings")

which conflicts with:

 1a7ff7216c8b ("sched_ext: Drop "ops" from scx_ops_enable_state and friends")

The former removes code updated by the latter. Resolved by removing the
updated section.

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