Greg Kroah-Hartman d7b0856eac Merge 00e4db5125 ("Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux") into android-mainline ...

Tiny steps on the way to 5.9-rc1.

Fixes conflicts in:
	fs/f2fs/inline.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I16d863ae44a51156499458e8c3486587cbe2babe

2020-08-11 10:57:46 +02:00

..

events

Merge 00e4db5125 ("Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux") into android-mainline

2020-08-11 10:57:46 +02:00

hooks

ANDROID: rwsem: Add vendor hook to the rw-semaphore

2020-07-28 03:04:13 +00:00

bpf_probe.h

bpf: Reliably preserve btf_trace_xxx types

2020-03-02 16:49:55 -08:00

define_trace.h

tracing: introduce TRACE_EVENT_NOP()

2019-04-08 09:22:51 -04: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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_events.h

tracing: not necessary to define DEFINE_EVENT_PRINT to be empty again

2020-06-30 14:29:32 -04:00