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

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <[email protected]>

2016-08-18 01:17:32 -04:00

..

blktrace.c

block: rename bio bi_rw to bi_opf

2016-08-07 14:41:02 -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

cpufreq: schedutil: New governor based on scheduler utilization data

2016-04-02 01:09:12 +02:00

ring_buffer_benchmark.c

ring_buffer: Remove unneeded smp_wmb() before wakeup of reader benchmark

2015-11-03 16:19:02 -05:00

ring_buffer.c

ring-buffer: Prevent overflow of size in ring_buffer_resize()

2016-05-13 16:44:20 -04:00

rpm-traces.c

…

trace_benchmark.c

tracing: Only benchmark the time tracepoints take if tracing is on

2015-11-02 13:34:58 -05:00

trace_benchmark.h

tracing: Add tracepoint benchmark tracepoint

2014-05-29 22:49:54 -04:00

trace_branch.c

tracing: Remove {start,stop}_branch_trace

2015-10-21 10:10:09 -04:00

trace_clock.c

tracing: Export tracing clock functions

2015-05-12 15:56:57 -04:00

trace_entries.h

ftrace: Reduce size of function graph entries

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

trace_event_perf.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2016-05-17 16:26:30 -07:00

trace_events_filter_test.h

…

trace_events_filter.c

tracing: Use temp buffer when filtering events

2016-05-03 17:59:24 -04:00

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

tracing: Add support for named triggers

2016-04-19 18:56:00 -04:00

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

tracing: ftrace_event_is_function() can return boolean

2015-11-02 14:28:05 -05:00

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

tracing: Remove redundant reset per-CPU buff in irqsoff tracer

2016-03-18 16:39:11 -04:00

trace_kdb.c

tracing: Move trace_flags from global to a trace_array field

2015-09-30 15:22:55 -04:00

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

tracing: Fix typoes in code comment and printk in trace_nop.c

2016-03-08 11:23:57 -05:00

trace_output.c

tracing: Record and show NMI state

2016-03-22 18:04:10 -04:00

trace_output.h

tracing: Turn seq_print_user_ip() into a static function

2015-09-28 10:16:12 -04:00

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

sched/core: Fix trace_sched_switch()

2015-10-06 17:08:15 +02:00

trace_sched_wakeup.c

Merge tag 'trace-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2015-11-06 13:30:20 -08:00

trace_selftest_dynamic.c

…

trace_selftest.c

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

2014-10-12 07:28:55 -04:00

trace_seq.c

tracing: use %*pb[l] to print bitmaps including cpumasks and nodemasks

2015-02-13 21:21:37 -08:00

trace_stack.c

tracing, kasan: Silence Kasan warning in check_stack of stack_tracer

2016-02-19 12:36:44 -05:00

trace_stat.c

kernel/...: convert pr_warning to pr_warn

2016-03-22 15:36:02 -07:00

trace_stat.h

…

trace_syscalls.c

perf: split perf_trace_buf_prepare into alloc and update parts

2016-04-07 21:04:26 -04:00

trace_uprobe.c

perf: split perf_trace_buf_prepare into alloc and update parts

2016-04-07 21:04:26 -04:00

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: Handle tracing_map_alloc_elts() error path correctly

2016-04-26 09:40:30 -04:00

tracing_map.h

tracing: Update some tracing_map constants and comments

2016-04-19 12:16:06 -04:00