Files
linux/include/asm-generic
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:

  a7b359fc6a: ("sched/fair: Correctly insert cfs_rq's to list on unthrottle")

and this fresh commit in sched/core modified it in the old location:

  9e077b52d8: ("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-08 16:04:20 -07:00
2021-05-07 00:26:34 -07:00
2020-01-23 10:41:16 -08:00
2021-01-20 09:30:45 +01:00
2018-03-09 23:19:56 +01:00
2018-05-07 07:15:41 +02:00