Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2018 03:04:22 +0000 (23:04 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2018 03:04:22 +0000 (23:04 -0400)
commita9537c937c1790b62de5e2789e67c0bf439b11ea
treef258739642417d820e1683e97966a3804f323ba9
parente9350d443584f5d72483b1ae035f4527cfac7a9a
parent25eb0ea7174c6e84f21fa59dccbddd0318b17b12
Merge git://git./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>
include/linux/bpf.h
kernel/bpf/arraymap.c
kernel/bpf/syscall.c
net/core/filter.c