]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit784a0ea5fc9e3acdf791a0cfbd48d29fd04d485a
treea884c05aaeff40d8f80831549cccc820dcdd0f4f
parent85e528147d541d21851e60099e99a696fbdc8e0e
parent42d36c066e60796fa9ad6e970f760548f8efce77
Merge git://git.kernel.org/pub/scm/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