Greg Kroah-Hartman 4d1e11edcc Merge 51e6d17809 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline ... First steps of the 5.12-rc1 merge, the large networking chunk. Resolves merge conflicts in: net/core/filter.c net/ipv6/route.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Id1650a4e7ab7104647e85beddddb672f779d4d1f		2021-02-23 08:01:48 +01:00
..
events	Merge 51e6d17809 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline	2021-02-23 08:01:48 +01:00
hooks	ANDROID: ftrace: vendor hook for ftrace dump on oops	2021-01-29 23:25:45 +00: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	treewide: Convert macro and uses of __section(foo) to __section("foo")	2020-10-25 14:51:49 -07:00