]> www.infradead.org Git - users/willy/xarray.git/commitdiff
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)
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>
1  2 
kernel/sched/ext.c

Simple merge