Greg Kroah-Hartman 9d91f3a9c7 Merge 6b7b0c3091 ("Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next") into android-mainline ... Steps on the way to 5.16-rc1. Resolves merge conflicts in: drivers/net/ethernet/intel/ice/ice_devlink.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I188502a1e6b84b61582bf3f5539785f8f2e7864f		2021-11-08 18:57:55 +01:00
..
events	Merge 6b7b0c3091 ("Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next") into android-mainline	2021-11-08 18:57:55 +01:00
hooks	Revert "ANDROID: futex: Add vendor hook for wait queue"	2021-11-03 14:11:33 +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: Add trace_event helper macros __string_len() and __assign_str_len()	2021-08-17 11:47:52 -04:00