git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e08cba1 f689c9d)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 27 Nov 2020 10:09:57 +0000 (11:09 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 27 Nov 2020 10:10:50 +0000 (11:10 +0100)
commit	1ac9109053fc620f00bd5e7e79d3174daf468896
tree	ec389c1494ef4790ea90f65c4f86e523caf325d0	tree \| snapshot
parent	e08cba18b9a15b25e8b2968b73df456c4a5441e8	commit \| diff
parent	f689c9d16f1eb50e149fede6c1a9621393029031	commit \| diff

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/kthread.c	diff1 \|	diff2 \|	blob \| history
kernel/rcu/tree.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/cpufreq_schedutil.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/deadline.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/smp.c	diff1 \|	diff2 \|	blob \| history
kernel/stop_machine.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/bpf_trace.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.