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 <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
blktrace.c
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
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2017-12-18 10:51:06 -05:00
Makefile
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_mmiotrace.c
trace_nop.c
trace_output.c
trace_output.h
trace_printk.c
trace_probe.c
trace_probe.h
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: Fix possible double free on failure of allocating trace buffer	2017-12-27 14:21:27 -05:00
trace.h
tracing_map.c
tracing_map.h