Merge branch 'linus' into perf/kprobes
authorIngo Molnar <mingo@kernel.org>
Sat, 7 Nov 2020 12:18:49 +0000 (13:18 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 7 Nov 2020 12:18:49 +0000 (13:18 +0100)
commit0a986ea81e1aa8ac17e82cda53cc95158217956e
treea054b0ef413b7f327c04137c5768b2da6488511d
parent6e426e0fcd20ce144bb93e00b70df51e9f2e08c3
parent36dadef23fcca55bb6531dc12822d3b165319ccc
Merge branch 'linus' into perf/kprobes

Merge recent kprobes updates into perf/kprobes that came from -mm.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/kprobes.h
kernel/kprobes.c
kernel/trace/trace_kprobe.c