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

Merging net into net-next to help the bpf folks avoid
some really ugly merge conflicts.

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

diff --cc include/linux/bpf.h
Simple merge

diff --cc kernel/bpf/arraymap.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc net/core/filter.c
Simple merge