Greg Kroah-Hartman 368ecbcb2f Merge 21a6ab2131 ("Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux") into android-mainline ... Steps on the way to 5.12-rc1 Resolves conflicts in: include/linux/module.h Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I44772d65a5d6b1c5f4c33905554092c2cdc5b210		2021-03-06 08:45:21 +01:00
..
events	Merge 21a6ab2131 ("Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux") into android-mainline	2021-03-06 08:45:21 +01:00
hooks	ANDROID: fixup restricted hooks after tracepont refactoring	2021-03-06 08:43:12 +01:00
bpf_probe.h	trace: bpf: Allow bpf to attach to bare tracepoints	2021-01-20 14:13:59 -08:00
define_trace.h	tracepoint: Optimize using static_call()	2020-09-01 09:58:06 +02:00
perf.h
syscall.h	tracepoints: Migrate to use SYSCALL_WORK flag	2020-11-16 21:53:15 +01:00
trace_events.h	tracing: Update the stage 3 of trace event macro comment	2021-02-11 16:31:57 -05:00