Ingo Molnar b2c0931a07 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>
2021-06-18 11:31:25 +02:00
..
2021-04-30 12:22:28 -07:00
2021-04-30 12:22:28 -07:00
2020-08-07 18:48:15 -07:00
2021-03-29 13:22:11 +11:00
2021-04-22 20:59:04 +10:00
2020-12-09 23:48:14 +11:00
2020-12-04 01:01:09 +11:00
2021-04-21 22:52:32 +10:00
2021-04-30 11:20:40 -07:00
2021-03-24 14:09:29 +11:00
2021-04-17 10:40:51 +10:00
2021-02-09 00:10:50 +11:00
2021-04-30 12:22:28 -07:00