Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 20 Apr 2017 14:35:33 +0000 (10:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Apr 2017 14:35:33 +0000 (10:35 -0400)
commit7b9f6da175f9387ebfc202f35e0d39514899ab19
treea884c05aaeff40d8f80831549cccc820dcdd0f4f
parent9868879f293c599ce13b584c5bd8800312970781
parent1debdc8f9ebd07daf140e417b3841596911e0066
Merge git://git./linux/kernel/git/davem/net

A function in kernel/bpf/syscall.c which got a bug fix in 'net'
was moved to kernel/bpf/verifier.c in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mediatek/mtk_eth_soc.h
drivers/net/phy/micrel.c
drivers/net/vrf.c
kernel/bpf/verifier.c
net/core/skbuff.c
net/ipv4/ipmr.c
net/ipv6/ip6_input.c