David S. Miller 5af84df962 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts are simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2021-07-23 16:13:06 +01:00
..
Kconfig	…
Makefile	…
blktrace.c	…
bpf_trace.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2021-07-15 22:40:10 -07:00
bpf_trace.h	…
error_report-traces.c	…
fgraph.c	…
ftrace.c	ftrace: Use list_move instead of list_del/list_add	2021-07-08 13:02:58 -04:00
ftrace_internal.h	…
kprobe_event_gen_test.c	…
power-traces.c	…
preemptirq_delay_test.c	…
ring_buffer.c	…
ring_buffer_benchmark.c	…
rpm-traces.c	…
synth_event_gen_test.c	…
trace.c	Tracing updates for 5.14:	2021-07-03 11:13:22 -07:00
trace.h	Tracing updates for 5.14:	2021-07-03 11:13:22 -07:00
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.c	…
trace_events_filter.c	…
trace_events_filter_test.h	…
trace_events_hist.c	tracing: Do not reference char * as a string in histograms	2021-07-15 17:06:13 -04:00
trace_events_inject.c	…
trace_events_synth.c	…
trace_events_trigger.c	…
trace_export.c	…
trace_functions.c	…
trace_functions_graph.c	…
trace_hwlat.c	…
trace_irqsoff.c	…
trace_kdb.c	…
trace_kprobe.c	…
trace_kprobe_selftest.c	…
trace_kprobe_selftest.h	…
trace_mmiotrace.c	…
trace_nop.c	…
trace_osnoise.c	trace/timerlat: Fix indentation on timerlat_main()	2021-06-29 16:37:50 -04:00
trace_output.c	…
trace_output.h	…
trace_preemptirq.c	…
trace_printk.c	…
trace_probe.c	…
trace_probe.h	…
trace_probe_tmpl.h	…
trace_recursion_record.c	…
trace_sched_switch.c	…
trace_sched_wakeup.c	tracing: Change variable type as bool for clean-up	2021-06-30 09:19:14 -04:00
trace_selftest.c	…
trace_selftest_dynamic.c	…
trace_seq.c	…
trace_stack.c	…
trace_stat.c	…
trace_stat.h	…
trace_synth.h	…
trace_syscalls.c	…
trace_uprobe.c	…
tracing_map.c	…
tracing_map.h	…