Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -07:00
..
Kconfig	tracing: Fix help text of TRACEPOINT_BENCHMARK in Kconfig	2021-03-04 09:45:17 -05:00
Makefile	tracing: add error_report_end trace point	2021-02-26 09:41:02 -08:00
blktrace.c	block-5.12-2021-02-27	2021-02-28 11:23:38 -08:00
bpf_trace.c	bpf: Add bpf_for_each_map_elem() helper	2021-02-26 13:23:52 -08:00
bpf_trace.h	…
error_report-traces.c	tracing: add error_report_end trace point	2021-02-26 09:41:02 -08:00
fgraph.c	…
ftrace.c	Add check of order < 0 before calling free_pages()	2021-03-31 10:14:55 -07:00
ftrace_internal.h	…
kprobe_event_gen_test.c	…
power-traces.c	…
preemptirq_delay_test.c	…
ring_buffer.c	ring-buffer: Add a little more information and a WARN when time stamp going backwards is detected	2021-03-04 09:45:17 -05:00
ring_buffer_benchmark.c	…
rpm-traces.c	…
synth_event_gen_test.c	…
trace.c	tracing: Fix stack trace event size	2021-04-01 14:06:33 -04:00
trace.h	tracing: Remove duplicate declaration from trace.h	2021-03-04 09:44:47 -05: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	Tracing updates for 5.12	2021-02-22 14:07:15 -08:00
trace_events_filter.c	…
trace_events_filter_test.h	…
trace_events_hist.c	…
trace_events_inject.c	…
trace_events_synth.c	tracing: Fix memory leak in __create_synth_event()	2021-03-04 09:45:57 -05:00
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	Modules updates for v5.12	2021-02-23 10:15:33 -08:00
trace_kprobe_selftest.c	…
trace_kprobe_selftest.h	…
trace_mmiotrace.c	…
trace_nop.c	…
trace_output.c	tracing: Show real address for trace event arguments	2021-02-11 16:31:57 -05:00
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	…
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	…