David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-22 13:39:14 +01: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-10-22 13:39:14 +01:00
hw_breakpoint.c
internal.h	tracing, perf: Adjust code layout in get_recursion_context()	2017-08-25 11:04:18 +02:00
Makefile
ring_buffer.c	perf/aux: Only update ->aux_wakeup in non-overwrite mode	2017-09-29 10:06:45 +02:00
uprobes.c	mm, uprobes: fix multiple free of ->uprobes_state.xol_area	2017-08-31 16:33:15 -07:00