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

net/ipv6/ip6_gre.c is a case of parallel adds.

include/trace/events/tcp.h is a little bit more tricky.  The removal
of in-trace-macro ifdefs in 'net' paralleled with moving
show_tcp_state_name and friends over to include/trace/events/sock.h
in 'net-next'.

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

2017-12-29 15:42:26 -05:00

..

blktrace.c

blktrace: fix trace mutex deadlock

2017-11-27 12:03:58 -07:00

bpf_trace.c

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

2017-12-18 10:51:06 -05:00

ftrace.c

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

2017-11-17 14:58:01 -08:00

Kconfig

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

2017-12-18 10:51:06 -05:00

Makefile

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

2017-11-17 14:58:01 -08:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

ring-buffer: Do no reuse reader page if still in use

2017-12-27 14:21:09 -05:00

rpm-traces.c

…

trace_benchmark.c

…

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

…

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

…

trace_kprobe.c

trace: reenable preemption if we modify the ip

2017-12-17 20:47:32 +01:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

…

trace_output.h

…

trace_printk.c

…

trace_probe.c

…

trace_probe.h

bpf: add a bpf_override_function helper

2017-12-12 09:02:34 -08:00

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

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

2017-11-17 14:58:01 -08:00

trace_seq.c

…

trace_stack.c

tracing: Have stack trace not record if RCU is not watching

2017-12-14 20:48:22 -05:00

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

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

2017-11-17 14:58:01 -08:00

trace_uprobe.c

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

2017-11-17 14:58:01 -08:00

trace.c

tracing: Fix possible double free on failure of allocating trace buffer

2017-12-27 14:21:27 -05:00

trace.h

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

2017-11-17 14:58:01 -08:00

tracing_map.c

…

tracing_map.h

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

2017-11-17 14:58:01 -08:00