git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9868879 1debdc8)

author	David S. Miller <davem@davemloft.net>
	Thu, 20 Apr 2017 14:35:33 +0000 (10:35 -0400)
committer	David S. Miller <davem@davemloft.net>
	Thu, 20 Apr 2017 14:35:33 +0000 (10:35 -0400)
commit	7b9f6da175f9387ebfc202f35e0d39514899ab19
tree	a884c05aaeff40d8f80831549cccc820dcdd0f4f	tree \| snapshot (tar.gz zip)
parent	9868879f293c599ce13b584c5bd8800312970781	commit \| diff
parent	1debdc8f9ebd07daf140e417b3841596911e0066	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mediatek/mtk_eth_soc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vrf.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_input.c	diff1 \|	diff2 \|	blob \| history