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
..
blktrace.c
bpf_trace.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2021-02-16 13:14:06 -08:00
bpf_trace.h
fgraph.c
ftrace_internal.h
ftrace.c
Kconfig
kprobe_event_gen_test.c
Makefile
power-traces.c
preemptirq_delay_test.c
ring_buffer_benchmark.c
ring_buffer.c
rpm-traces.c
synth_event_gen_test.c
trace_benchmark.c
trace_benchmark.h
trace_boot.c
trace_branch.c
trace_clock.c
trace_dynevent.c
trace_dynevent.h
trace_entries.h
trace_event_perf.c
trace_events_filter_test.h
trace_events_filter.c
trace_events_hist.c
trace_events_inject.c
trace_events_synth.c
trace_events_trigger.c
trace_events.c	tracing: Do not count ftrace events in top level enable output	2021-02-05 15:40:04 -05:00
trace_export.c
trace_functions_graph.c
trace_functions.c
trace_hwlat.c
trace_irqsoff.c
trace_kdb.c
trace_kprobe_selftest.c
trace_kprobe_selftest.h
trace_kprobe.c
trace_mmiotrace.c
trace_nop.c
trace_output.c
trace_output.h
trace_preemptirq.c
trace_printk.c
trace_probe_tmpl.h
trace_probe.c
trace_probe.h
trace_recursion_record.c
trace_sched_switch.c
trace_sched_wakeup.c
trace_selftest_dynamic.c
trace_selftest.c
trace_seq.c
trace_stack.c
trace_stat.c
trace_stat.h
trace_synth.h
trace_syscalls.c
trace_uprobe.c
trace.c	Merge 358feceebb ("Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux") into android-mainline	2021-02-14 13:47:24 +01:00
trace.h
tracing_map.c
tracing_map.h