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: 2d3ebe2 47599c6)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 10 Dec 2019 09:11:00 +0000 (10:11 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 10 Dec 2019 09:11:00 +0000 (10:11 +0100)
commit	bd75dfc3dce57f9c64fd263f0b267d9a639862e7
tree	e9c15448e841cc493bc80b9f658d7955623e86dd	tree \| snapshot
parent	2d3ebe27fef7b725f09001762cd7373dd262a292	commit \| diff
parent	47599c6298943ede4662b5e31dfe375feac1b48a	commit \| diff

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

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

15 files changed:

arch/arm/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/ftrace.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ftrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trace.h	diff1 \|	diff2 \|	blob \| history
include/linux/module.h	diff1 \|	diff2 \|	blob \| history
include/linux/trace_events.h	diff1 \|	diff2 \|	blob \| history
include/trace/trace_events.h	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events_hist.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_export.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_syscalls.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.