From: Tejun Heo Date: Tue, 8 Apr 2025 18:56:57 +0000 (-1000) Subject: sched_ext: Merge branch 'for-6.15-fixes' into for-6.16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=294f5ff47405f920d85b8d411ddbc52ed708a423;p=users%2Fjedix%2Flinux-maple.git 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 --- 294f5ff47405f920d85b8d411ddbc52ed708a423