Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-6.11

Browse source

d329605287 ("sched/fair: set_load_weight() must also call reweight_task()
for SCHED_IDLE tasks") applied to sched/core changes how reweight_task() is
called causing conflicts with e83edbf88f ("sched: Add
sched_class->reweight_task()"). Resolve the conflicts by taking
set_load_weight() changes from d329605287 and updating
sched_class->reweight_task() to take pointer to struct load_weight instead
of int prio.

Signed-off-by: Tejun Heo<tj@kernel.org>

...

This commit is contained in:

Tejun Heo 2024-07-08 07:01:58 -10:00

parent 18b2bd0337 d329605287

commit 7b9f6c864a

5 changed files with 44 additions and 46 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

23

kernel/sched/core.c

View file

3

kernel/sched/ext.c

View file

8

kernel/sched/fair.c

View file

54

kernel/sched/psi.c

View file

2

kernel/sched/sched.h

View file