| commit | b2c0931a07b7376c6291e0cfb347ad27f7b66263 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Jun 18 11:31:25 2021 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Jun 18 11:31:25 2021 +0200 |
| tree | 58ee600a10ecc49f473429a73c6c079422dac97f | |
| parent | 94aafc3ee31dc199d1078ffac9edd976b7f47b3d [diff] | |
| parent | a7b359fc6a37faaf472125867c8dc5a068c90982 [diff] |
Merge branch 'sched/urgent' into sched/core, to resolve conflicts
This commit in sched/urgent moved the cfs_rq_is_decayed() function:
a7b359fc6a37: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle")
and this fresh commit in sched/core modified it in the old location:
9e077b52d86a: ("sched/pelt: Check that *_avg are null when *_sum are")
Merge the two variants.
Conflicts:
kernel/sched/fair.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>