David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
blktrace.c	convert a bunch of open-coded instances of memdup_user_nul()	2016-01-04 10:26:58 -05:00
bpf_trace.c	bpf: introduce BPF_MAP_TYPE_STACK_TRACE	2016-02-20 00:21:44 -05:00
ftrace.c	ftrace/module: remove ftrace module notifier	2016-02-17 22:14:06 +01:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-10 18:11:41 -08:00
Makefile	bpf: Fix the build on BPF_SYSCALL=y && !CONFIG_TRACING kernels, make it more configurable	2015-04-02 16:28:06 +02:00
power-traces.c	PM / sleep: export suspend_resume trace event	2015-01-30 02:10:41 +01: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: Process commits whenever moving to a new page.	2015-11-25 15:24:05 -05:00
rpm-traces.c	PM / Runtime: Introduce trace points for tracing rpm_* functions	2011-09-27 22:53:27 +02:00
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	tracing: %pF is only for function pointers	2015-03-25 08:57:22 -04:00
trace_event_perf.c	Not much new with tracing for this release. Mostly just clean ups and	2016-01-12 20:04:15 -08:00
trace_events_filter_test.h	tracing/filter: Add startup tests for events filter	2011-08-19 14:35:59 -04:00
trace_events_filter.c	tracing: is_legal_op() can return boolean	2015-11-02 14:26:51 -05:00
trace_events_trigger.c	Not much new with tracing for this release. Mostly just clean ups and	2016-01-12 20:04:15 -08:00
trace_events.c	kernel/*: switch to memdup_user_nul()	2016-01-04 10:27:55 -05: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: Remove unused ftrace_cpu_disabled per cpu variable	2015-11-07 13:25:14 -05:00
trace_functions.c	tracing/trivial: Fix typos and make an int into a bool	2014-11-20 10:05:36 -05:00
trace_irqsoff.c	tracing: report_latency() in trace_irqsoff.c can return boolean	2015-11-02 14:20:19 -05: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	lib: introduce strncpy_from_unsafe()	2015-08-28 16:27:27 -07:00
trace_mmiotrace.c	tracing: Pass trace_array into trace_buffer_unlock_commit()	2015-09-25 17:38:44 -04:00
trace_nop.c	tracing: Remove unneeded includes of debugfs.h and fs.h	2015-01-22 11:19:48 -05:00
trace_output.c	tracing: Move trace_flags from global to a trace_array field	2015-09-30 15:22:55 -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: Fix setting of start_index in find_next()	2016-01-04 15:22:47 -05:00
trace_probe.c	trace: Don't use __weak in header files	2015-03-25 08:57:23 -04:00
trace_probe.h	kernel/trace_probe: is_good_name can be boolean	2015-09-22 13:11:30 -04:00
trace_sched_switch.c	sched/core: Fix trace_sched_switch()	2015-10-06 17:08:15 +02:00
trace_sched_wakeup.c	Most of the changes are clean ups and small fixes. Some of them have	2015-11-06 13:30:20 -08:00
trace_selftest_dynamic.c	ftrace: Add self-tests for multiple function trace users	2011-05-18 19:24:51 -04:00
trace_selftest.c	Seems that Peter Zijlstra added a new check that is making old	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/stacktrace: Show entire trace if passed in function not found	2016-01-29 12:19:10 -05:00
trace_stat.c	tracing: Convert the tracing facility over to use tracefs	2015-02-03 12:48:41 -05:00
trace_stat.h
trace_syscalls.c	tracing: Move trace_flags from global to a trace_array field	2015-09-30 15:22:55 -04:00
trace_uprobe.c	tracing/uprobes: Do not print '0x (null)' when offset is 0	2015-08-26 10:43:01 -03:00
trace.c	tracing: Fix stacktrace skip depth in trace_buffer_unlock_commit_regs()	2016-01-14 09:28:19 -05:00
trace.h	tracing: Fix comment to use tracing_on over tracing_enable	2015-12-23 14:27:25 -05:00