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
..
2020-08-09 14:10:26 -07:00
2021-04-29 11:28:08 -07:00
2020-10-30 17:34:45 +11:00
2021-04-14 16:30:30 +03:00
2021-05-06 19:24:12 -07:00
2021-05-05 12:39:29 -07:00
2018-08-16 12:14:42 -07:00
2021-01-21 14:06:00 -07:00
2021-06-05 08:58:12 -07:00
2021-01-03 20:05:18 -05:00
2020-10-20 14:39:37 -07:00
2021-04-14 16:30:30 +03:00
2021-04-30 11:20:36 -07:00
2021-02-26 09:41:05 -08:00
2018-10-16 13:45:44 +02:00
2021-05-06 19:24:12 -07:00
2020-06-15 18:22:43 -07:00
2019-07-11 15:17:41 -07:00
2020-12-15 22:46:16 -08:00
2018-10-15 16:31:29 -04:00
2020-12-15 22:46:16 -08:00
2021-04-28 10:01:40 -07:00
2021-02-26 09:41:05 -08:00
2021-02-26 09:41:05 -08:00
2021-04-28 10:01:40 -07:00