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

All three conflicts were cases of simple overlapping
changes.

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

2016-08-30 00:54:02 -04:00

..

blktrace.c

block: Fix secure erase

2016-08-16 09:16:51 -06:00

bpf_trace.c

bpf: allow bpf_get_prandom_u32() to be used in tracing

2016-08-12 21:57:05 -07:00

ftrace.c

ftrace: Move toplevel init out of ftrace_init_tracefs()

2016-07-05 10:47:03 -04:00

Kconfig

tracing: Have HIST_TRIGGERS select TRACING

2016-07-05 15:49:01 -04:00

Makefile

Makefile: Mute warning for __builtin_return_address(>0) for tracing only

2016-08-02 12:57:48 -04:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

rpm-traces.c

…

trace_benchmark.c

…

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

ftrace: Reduce size of function graph entries

2016-07-05 17:28:30 -04:00

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

tracing: Fix use-after-free in hist_register_trigger()

2016-08-02 15:16:30 -04:00

trace_events_trigger.c

…

trace_events.c

tracing: Show the preempt count of when the event was called

2016-06-20 09:54:21 -04:00

trace_export.c

…

trace_functions_graph.c

tracing/function_graph: Fix filters for function_graph threshold

2016-06-27 13:29:24 -04:00

trace_functions.c

ftrace: Have set_ftrace_pid use the bitmap like events do

2016-06-20 09:54:19 -04:00

trace_irqsoff.c

…

trace_kdb.c

…

trace_kprobe.c

tracing: expose current->comm to [ku]probe events

2016-06-20 09:54:19 -04:00

trace_mmiotrace.c

tracing: Expose CPU physical addresses (resource values) for PCI devices

2016-06-20 09:54:22 -04:00

trace_nop.c

…

trace_output.c

…

trace_output.h

…

trace_printk.c

tracing: Handle NULL formats in hold_module_trace_bprintk_format()

2016-06-20 09:46:12 -04:00

trace_probe.c

tracing: expose current->comm to [ku]probe events

2016-06-20 09:54:19 -04:00

trace_probe.h

tracing: expose current->comm to [ku]probe events

2016-06-20 09:54:19 -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

…

trace_uprobe.c

…

trace.c

tracing: Using for_each_set_bit() to simplify trace_pid_write()

2016-07-05 11:22:40 -04:00

trace.h

ftrace: Reduce size of function graph entries

2016-07-05 17:28:30 -04:00

tracing_map.c

…

tracing_map.h

…