Skip to content
Snippets Groups Projects
user avatar
Frederic Weisbecker authored
Conflicts:
	kernel/trace/trace_export.c
	kernel/trace/trace_kprobe.c

Merge reason: This topic branch lacks an important
build fix in tracing/core:

	0dd7b747:
	tracing: Fix double CPP substitution in TRACE_EVENT_FN

that prevents from multiple tracepoint headers inclusion crashes.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
8f8ffe24
History