Merge branch 'linus' into sched/core, to resolve semantic conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Nov 2020 10:09:57 +0000 (11:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Nov 2020 10:10:50 +0000 (11:10 +0100)
commita787bdaff83a085288b6fc607afb4bb648da3cc9
treeec389c1494ef4790ea90f65c4f86e523caf325d0
parent2914b0ba61a9d253535e51af16c7122a8148995d
parent85a2c56cb4454c73f56d3099d96942e7919b292f
Merge branch 'linus' into sched/core, to resolve semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/sched.h
kernel/exit.c
kernel/kthread.c
kernel/rcu/tree.c
kernel/sched/core.c
kernel/sched/cpufreq_schedutil.c
kernel/sched/deadline.c
kernel/sched/fair.c
kernel/smp.c
kernel/stop_machine.c
kernel/trace/bpf_trace.c