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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

callchain.c

perf/callchain: Force USER_DS when invoking perf_callchain_user()

2017-05-10 07:54:00 +02:00

core.c

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

2017-06-15 11:59:32 -04:00

hw_breakpoint.c

perf: Collapse and fix event_function_call() users

2016-01-21 18:54:24 +01:00

internal.h

bpf, events: fix offset in skb copy handler

2016-07-25 10:34:11 -07:00

Makefile

ftrace: allow architectures to specify ftrace compile options

2015-01-29 09:19:19 +01:00

ring_buffer.c

perf/core: Add a flag for partial AUX records

2017-03-16 09:51:11 +01:00

uprobes.c

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

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