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: 2e2d5d7 2627393)

author	David S. Miller <davem@davemloft.net>
	Thu, 10 Aug 2017 19:11:16 +0000 (12:11 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 10 Aug 2017 19:11:16 +0000 (12:11 -0700)
commit	3b2b69efeca734b78bc85fd02253b0465bb2bec7
tree	57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47	tree \| snapshot (tar.gz zip)
parent	2e2d5d767c9ddb2b10d74f2c20a257101c7070eb	commit \| diff
parent	26273939ace935dd7553b31d279eab30b40f7b9a	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bcmsysport.c	diff1 \|	diff2 \|	blob \| history
drivers/net/geneve.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/igmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history