git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f66c044 e42617b)

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	2040cf9f59037aa8aec749363e69ead165b67b43
tree	e9c15448e841cc493bc80b9f658d7955623e86dd	tree
parent	f66c0447cca1281116224d474cdb37d6a18e4b5b	commit \| diff
parent	e42617b825f8073569da76dc4510bfa019b1c35a	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

Unnamed repository; edit this file 'description' to name the repository.