Greg Kroah-Hartman 14f1854cdb Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline ... Steps on the way to 5.12-rc1 Resolves merge conflicts in: drivers/dma-buf/dma-heap.c drivers/dma-buf/heaps/cma_heap.c drivers/dma-buf/heaps/system_heap.c include/linux/dma-heap.h Cc: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ibb32dbdba5183c9e19f5d1e94016cc1ae9616173		2021-03-07 08:45:40 +01:00
..
events	Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline	2021-03-07 08:45:40 +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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
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