git.ipfire.org Git - thirdparty/kernel/stable.git/commit

]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit

projects / thirdparty / kernel / stable.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2914b0b 85a2c56)

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	a787bdaff83a085288b6fc607afb4bb648da3cc9
tree	ec389c1494ef4790ea90f65c4f86e523caf325d0	tree \| snapshot
parent	2914b0ba61a9d253535e51af16c7122a8148995d	commit \| diff
parent	85a2c56cb4454c73f56d3099d96942e7919b292f	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

Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git