linux/Documentation
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-05-15 08:32:51 -07:00
2021-05-10 15:17:34 -06:00
2021-06-12 12:34:49 -07:00
2021-04-30 12:22:28 -07:00
2021-04-07 17:32:12 +10:00
2021-04-29 14:32:00 -07:00
2021-05-10 15:17:34 -06:00
2021-04-28 14:27:12 -07:00
2021-04-26 16:32:11 -07:00
2021-05-10 15:17:34 -06:00
2021-05-16 09:55:05 -07:00
2021-04-30 11:20:37 -07:00