Merge branch 'linus' into sched/core, to resolve semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2020-11-27 11:09:57 +01:00
1807 changed files with 21317 additions and 37493 deletions

View File

@@ -194,7 +194,7 @@ static void ack_state(struct multi_stop_data *msdata)
set_state(msdata, msdata->state + 1);
}
void __weak stop_machine_yield(const struct cpumask *cpumask)
notrace void __weak stop_machine_yield(const struct cpumask *cpumask)
{
cpu_relax();
}