David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-05-02 22:14:21 -04:00

..

blktrace.c

blkcg: annotate implicit fall through

2019-03-13 14:31:12 -06:00

bpf_trace.c

bpf: add writable context for raw tracepoints

2019-04-26 19:04:19 -07:00

fgraph.c

…

ftrace_internal.h

…

ftrace.c

kprobes: Mark ftrace mcount handler functions nokprobe

2019-04-19 14:26:06 +02:00

Kconfig

…

Makefile

…

power-traces.c

…

preemptirq_delay_test.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

trace: Fix preempt_enable_no_resched() abuse

2019-04-26 11:45:03 -04:00

rpm-traces.c

…

trace_benchmark.c

…

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

…

trace_dynevent.c

tracing: initialize variable in create_dyn_event()

2019-03-26 08:35:36 -04:00

trace_dynevent.h

…

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

tracing: Remove unnecessary var_ref destroy in track_data_destroy()

2019-03-26 08:34:00 -04:00

trace_events_trigger.c

…

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_hwlat.c

…

trace_irqsoff.c

…

trace_kdb.c

tracing: kdb: Fix ftdump to not sleep

2019-03-13 09:46:10 -04:00

trace_kprobe_selftest.c

…

trace_kprobe_selftest.h

…

trace_kprobe.c

Merge tag 'trace-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2019-03-15 14:47:02 -07:00

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

tracing/probe: Check event/group naming rule at parsing

2019-03-14 19:54:11 -04:00

trace_probe.h

tracing/probe: Check the size of argument name and body

2019-03-14 19:53:57 -04:00

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_syscalls.c

syscalls: Remove start and number from syscall_get_arguments() args

2019-04-05 09:26:43 -04:00

trace_uprobe.c

Merge tag 'trace-v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2019-03-15 14:47:02 -07:00

trace.c

Merge tag 'trace-v5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2019-04-26 11:09:55 -07:00

trace.h

…

tracing_map.c

…

tracing_map.h

…