diff options
| author | Tejun Heo <tj@kernel.org> | 2024-07-08 07:01:58 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-07-08 07:06:26 -1000 |
| commit | 7b9f6c864a3429ef086998a3d2b04e93fee7d051 (patch) | |
| tree | 07fb5fa61305e9926edb1304d58ff1dcfe1f72b2 /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | 18b2bd03371b64fdb21b31eb48095099d95b56ef (diff) | |
| parent | d329605287020c3d1c3b0dadc63d8208e7251382 (diff) | |
Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-6.11
d32960528702 ("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 e83edbf88f18 ("sched: Add
sched_class->reweight_task()"). Resolve the conflicts by taking
set_load_weight() changes from d32960528702 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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions