tree 2bd3c1c1d128e0c362655fa70a6eea02fc856f62
parent 3268e5cb494d8778a5a67a9fa2b1bdb0243b77ad
parent 73796d8bf27372e26c2b79881947304c14c2d353
author David S. Miller <davem@davemloft.net> 1450408108 -0500
committer David S. Miller <davem@davemloft.net> 1450408108 -0500

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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