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

..

autogroup.c

sched/autogroup: Make autogroup_path() always available

2019-06-24 19:23:40 +02:00

autogroup.h

…

clock.c

sched: Fix various typos

2021-03-22 00:11:52 +01:00

completion.c

completion: Use lockdep_assert_RT_in_threaded_ctx() in complete_all()

2020-03-23 18:40:25 +01:00

core_sched.c

sched: prctl() core-scheduling interface

2021-05-12 11:43:31 +02:00

core.c

sched/fair: Age the average idle time

2021-06-17 14:11:44 +02:00

cpuacct.c

sched: Wrap rq::lock access

2021-05-12 11:43:26 +02:00

cpudeadline.c

sched,rt: Use the full cpumask for balancing

2020-11-10 18:39:00 +01:00

cpudeadline.h

…

cpufreq_schedutil.c

sched/cpufreq: Consider reduced CPU capacity in energy calculation

2021-06-17 14:11:43 +02:00

cpufreq.c

cpufreq: Avoid leaving stale IRQ work items during CPU offline

2019-12-12 17:59:43 +01:00

cpupri.c

sched: Fix various typos

2021-03-22 00:11:52 +01:00

cpupri.h

sched/cpupri: Add CPUPRI_HIGHER

2020-10-29 11:00:30 +01:00

cputime.c

Merge tag 'sched-core-2021-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2021-04-28 13:33:57 -07:00

deadline.c

sched: Introduce sched_class::pick_task()

2021-05-12 11:43:28 +02:00

debug.c

Merge branch 'sched/urgent' into sched/core, to resolve conflicts

2021-06-18 11:31:25 +02:00

fair.c

Merge branch 'sched/urgent' into sched/core, to resolve conflicts

2021-06-18 11:31:25 +02:00

features.h

sched: Warn on long periods of pending need_resched

2021-04-21 13:55:41 +02:00

idle.c

sched: Trivial forced-newidle balancer

2021-05-12 11:43:30 +02:00

isolation.c

sched/isolation: Reconcile rcu_nocbs= and nohz_full=

2021-05-13 14:12:47 +02:00

loadavg.c

sched: Make multiple runqueue task counters 32-bit

2021-05-12 21:34:17 +02:00

Makefile

sched: Trivial core scheduling cookie management

2021-05-12 11:43:31 +02:00

membarrier.c

sched/membarrier: fix missing local execution of ipi_sync_rq_state()

2021-03-06 12:40:21 +01:00

pelt.c

sched: Fix various typos

2021-03-22 00:11:52 +01:00

pelt.h

Merge branch 'sched/urgent' into sched/core, to resolve conflicts

2021-06-18 11:31:25 +02:00

psi.c

psi: Fix psi state corruption when schedule() races with cgroup move

2021-05-06 15:33:26 +02:00

rt.c

sched: Introduce sched_class::pick_task()

2021-05-12 11:43:28 +02:00

sched-pelt.h

sched/fair: Fix "runnable_avg_yN_inv" not used warnings

2019-06-17 12:15:58 +02:00

sched.h

sched/fair: Age the average idle time

2021-06-17 14:11:44 +02:00

smp.h

sched/headers: Split out open-coded prototypes into kernel/sched/smp.h

2020-05-28 11:03:20 +02:00

stats.c

sched: Fix various typos

2021-03-22 00:11:52 +01:00

stats.h

sched,stats: Further simplify sched_info

2021-05-18 12:53:53 +02:00

stop_task.c

sched: Introduce sched_class::pick_task()

2021-05-12 11:43:28 +02:00

swait.c

sched/swait: Prepare usage in completions

2020-03-21 16:00:23 +01:00

topology.c

sched: Wrap rq::lock access

2021-05-12 11:43:26 +02:00

wait_bit.c

sched/wait: fix ___wait_var_event(exclusive)

2019-12-17 13:32:50 +01:00

wait.c

sched/wait: Add add_wait_queue_priority()

2020-11-15 09:49:09 -05:00