David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -07:00
..
blktrace.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
bpf_trace.c	bpf: Add bpf_copy_from_user() helper.	2020-08-28 21:20:33 +02:00
bpf_trace.h	bpf: Use dedicated bpf_trace_printk event instead of trace_printk()	2020-07-13 16:55:49 -07:00
fgraph.c
ftrace.c	ftrace: let ftrace_enable_sysctl take a kernel pointer buffer	2020-09-19 13:13:39 -07:00
ftrace_internal.h
Kconfig
kprobe_event_gen_test.c
Makefile	Kbuild updates for v5.9	2020-08-09 14:10:26 -07:00
power-traces.c
preemptirq_delay_test.c
ring_buffer.c	Tracing updates for 5.9	2020-08-07 18:29:15 -07:00
ring_buffer_benchmark.c	sched,tracing: Convert to sched_set_fifo()	2020-07-29 11:43:53 +02:00
rpm-traces.c
synth_event_gen_test.c
trace.c	tracing: Make the space reserved for the pid wider	2020-09-18 12:42:11 -04:00
trace.h	ftrace: Fix ftrace_trace_task return value	2020-08-03 16:12:31 -04:00
trace_benchmark.c
trace_benchmark.h
trace_boot.c	tracing/boottime: Fix kprobe multiple events	2020-06-23 21:51:50 -04:00
trace_branch.c
trace_clock.c
trace_dynevent.c
trace_dynevent.h
trace_entries.h
trace_event_perf.c
trace_events.c	tracing: Use trace_sched_process_free() instead of exit() for pid tracing	2020-08-04 20:15:07 -04:00
trace_events_filter.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
trace_events_filter_test.h
trace_events_hist.c	tracing: fix double free	2020-09-18 13:16:40 -04:00
trace_events_inject.c
trace_events_synth.c
trace_events_trigger.c	tracing: Fix event trigger to accept redundant spaces	2020-06-23 21:51:40 -04:00
trace_export.c
trace_functions.c
trace_functions_graph.c
trace_hwlat.c	tracing/hwlat: Honor the tracing_cpumask	2020-07-30 19:35:04 -04:00
trace_irqsoff.c
trace_kdb.c
trace_kprobe.c
trace_kprobe_selftest.c
trace_kprobe_selftest.h
trace_mmiotrace.c
trace_nop.c
trace_output.c	tracing: Make the space reserved for the pid wider	2020-09-18 12:42:11 -04:00
trace_output.h
trace_preemptirq.c	lockdep: fix order in trace_hardirqs_off_caller()	2020-09-14 10:08:07 +02:00
trace_printk.c
trace_probe.c
trace_probe.h
trace_probe_tmpl.h
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/uprobe: Remove dead code in trace_uprobe_register()	2020-08-03 16:16:46 -04:00
tracing_map.c
tracing_map.h