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

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

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

2017-04-21 20:23:53 -07:00

..

blktrace.c

…

bpf_trace.c

bpf: remove struct bpf_prog_type_list

2017-04-11 14:38:43 -04:00

ftrace.c

ftrace: Fix function pid filter on instances

2017-04-17 16:44:23 -04:00

Kconfig

perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS

2017-03-01 10:26:39 +01:00

Makefile

perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS

2017-03-01 10:26:39 +01:00

power-traces.c

…

ring_buffer_benchmark.c

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

ring_buffer.c

ring-buffer: Have ring_buffer_iter_empty() return true when empty

2017-04-19 21:23:47 -04:00

rpm-traces.c

…

trace_benchmark.c

tracing: Fix return value check in trace_benchmark_reg()

2017-02-15 09:02:27 -05:00

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

trace_events_trigger.c

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_hwlat.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>

2017-03-02 08:42:27 +01:00

trace_irqsoff.c

…

trace_kdb.c

…

trace_kprobe.c

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h>

2017-03-02 08:42:28 +01:00

trace_output.h

…

trace_printk.c

…

trace_probe.c

tracing/probes: Fix a warning message to show correct maximum length

2017-02-15 10:32:48 -05:00

trace_probe.h

perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS

2017-03-01 10:26:39 +01:00

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>

2017-03-02 08:42:27 +01:00

trace_seq.c

…

trace_stack.c

scripts/spelling.txt: add "overide" pattern and fix typo instances

2017-03-09 17:01:09 -08:00

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_uprobe.c

sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>

2017-03-02 08:42:38 +01:00

trace.c

tracing: Allocate the snapshot buffer before enabling probe

2017-04-19 14:19:08 -04:00

trace.h

ftrace: Fix function pid filter on instances

2017-04-17 16:44:23 -04:00

tracing_map.c

…

tracing_map.h

…