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

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

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

2017-02-07 16:29:30 -05:00

..

blktrace.c

block: better op and flags encoding

2016-10-28 08:48:16 -06:00

bpf_trace.c

bpf: add bpf_probe_read_str helper

2017-01-20 12:08:43 -05:00

ftrace.c

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

Kconfig

ftrace: Support full glob matching

2016-11-14 16:42:58 -05:00

Makefile

Disable the __builtin_return_address() warning globally after all

2016-10-12 10:23:41 -07:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

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

2016-12-15 13:49:34 -08:00

rpm-traces.c

…

trace_benchmark.c

tracing: Allow benchmark to be enabled at early_initcall()

2016-12-09 09:16:15 -05:00

trace_benchmark.h

tracing: Have the reg function allow to fail

2016-12-09 09:13:30 -05:00

trace_branch.c

tracing: Make __buffer_unlock_commit() always_inline

2016-11-23 20:30:51 -05:00

trace_clock.c

…

trace_entries.h

tracing: Add new trace_marker_raw

2016-11-15 15:13:59 -05: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/filter: Define op as the enum that it is

2016-11-14 16:42:59 -05: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: Call traceoff trigger after event is recorded

2016-09-23 09:47:59 -04:00

trace_events.c

tracing: Have system enable return error if one of the events fail

2016-12-09 09:15:41 -05:00

trace_export.c

…

trace_functions_graph.c

tracing/fgraph: Have wakeup and irqsoff tracers ignore graph functions too

2016-12-09 09:21:35 -05:00

trace_functions.c

ftrace: Have set_ftrace_pid use the bitmap like events do

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

trace_hwlat.c

tracing: Fix hwlat kthread migration

2017-01-31 09:13:49 -05:00

trace_irqsoff.c

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

trace_kdb.c

…

trace_kprobe.c

tracing/kprobes: Fix __init annotation

2017-02-02 10:48:35 -05: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: rename trace_print_hex_seq arg and add kdoc

2017-02-03 15:50:18 -05:00

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

ftrace: kprobe: uprobe: Show u8/u16/u32/u64 types in decimal

2016-08-23 17:06:38 -03:00

trace_probe.h

ftrace: kprobe: uprobe: Show u8/u16/u32/u64 types in decimal

2016-08-23 17:06:38 -03:00

trace_sched_switch.c

…

trace_sched_wakeup.c

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_seq.c

…

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

tracing/syscalls: fix multiline in error message text

2016-09-29 10:25:23 +02:00

trace_uprobe.c

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

2016-10-06 11:48:41 -07:00

trace.c

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

trace.h

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

tracing_map.c

tracing: Handle tracing_map_alloc_elts() error path correctly

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

tracing_map.h

…