mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-27 16:24:08 -05:00
0df340ceae
Pull tip/sched/core to resolve the following four conflicts. While 2-4 are simple context conflicts, 1 is a bit subtle and easy to resolve incorrectly. 1.2c8d046d5d("sched: Add normal_policy()") vs.faa42d2941("sched/fair: Make SCHED_IDLE entity be preempted in strict hierarchy") The former converts direct test on p->policy to use the helper normal_policy(). The latter moves the p->policy test to a different location. Resolve by converting the test on p->plicy in the new location to use normal_policy(). 2.a7a9fc5492("sched_ext: Add boilerplate for extensible scheduler class") vs.a110a81c52("sched/deadline: Deferrable dl server") Both add calls to put_prev_task_idle() and set_next_task_idle(). Simple context conflict. Resolve by taking changes from both. 3.a7a9fc5492("sched_ext: Add boilerplate for extensible scheduler class") vs.c245910049("sched/core: Add clearing of ->dl_server in put_prev_task_balance()") The former changes for_each_class() itertion to use for_each_active_class(). The latter moves away the adjacent dl_server handling code. Simple context conflict. Resolve by taking changes from both. 4.60c27fb59f("sched_ext: Implement sched_ext_ops.cpu_online/offline()") vs.31b164e2e4("sched/smt: Introduce sched_smt_present_inc/dec() helper")2f02735412("sched/core: Introduce sched_set_rq_on/offline() helper") The former adds scx_rq_deactivate() call. The latter two change code around it. Simple context conflict. Resolve by taking changes from both. Signed-off-by: Tejun Heo <tj@kernel.org>