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

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

2018-04-01 19:49:34 -04:00

..

blktrace.c

blktrace: fix trace mutex deadlock

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

bpf_trace.c

bpf: Check attach type at prog load time

2018-03-31 02:14:44 +02:00

ftrace.c

ftrace: Remove incorrect setting of glob search field

2018-02-08 10:11:11 -05:00

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-01-17 00:10:42 -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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ring_buffer_benchmark.c

ring-buffer: Have ring_buffer_alloc_read_page() return error on offline CPU

2017-08-02 14:23:02 -04:00

ring_buffer.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

rpm-traces.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_benchmark.c

trace: Eliminate cond_resched_rcu_qs() in favor of cond_resched()

2017-12-04 10:28:58 -08:00

trace_benchmark.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_branch.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_event_perf.c

perf/ftrace: Small cleanup

2017-10-16 18:13:28 -04:00

trace_events_filter_test.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_events_filter.c

tracing: Fix parsing of globs with a wildcard at the beginning

2018-02-08 10:11:47 -05:00

trace_events_hist.c

tracing: Reimplement log2

2017-10-04 13:10:39 -04:00

trace_events_trigger.c

tracing: Update stack trace skipping for ORC unwinder

2018-01-23 15:57:00 -05:00

trace_events.c

tracing: Make sure the parsed string always terminates with '\0'

2018-01-23 15:57:28 -05:00

trace_export.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_functions_graph.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_functions.c

tracing: Update stack trace skipping for ORC unwinder

2018-01-23 15:57:00 -05:00

trace_hwlat.c

trace: make trace_hwlat timestamp y2038 safe

2017-05-08 17:15:15 -07:00

trace_irqsoff.c

tracing: Add support for preempt and irq enable/disable events

2017-10-10 18:58:43 -04:00

trace_kdb.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_kprobe.c

tracing: probeevent: Fix to support minus offset from symbol

2018-03-23 12:02:37 -04:00

trace_mmiotrace.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_nop.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_output.c

sched/debug: Rename task-state printing helpers

2017-10-10 11:43:29 +02:00

trace_output.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_printk.c

tracing: Handle NULL formats in hold_module_trace_bprintk_format()

2016-06-20 09:46:12 -04:00

trace_probe.c

tracing: probeevent: Fix to support minus offset from symbol

2018-03-23 12:02:37 -04:00

trace_probe.h

tracing: probeevent: Fix to support minus offset from symbol

2018-03-23 12:02:37 -04:00

trace_sched_switch.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_sched_wakeup.c

Merge branch 'linus' into sched/core, to pick up fixes

2017-11-08 10:17:15 +01:00

trace_selftest_dynamic.c

ftrace: Mark function tracer test functions noinline/noclone

2018-01-23 15:57:29 -05:00

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

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

trace_stat.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

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

trace_uprobe: Display correct offset in uprobe_events

2018-01-23 15:57:29 -05:00

trace.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08: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: Remove lookups from tracing_map hitcount

2017-10-04 13:05:42 -04:00

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