tree 36b99da43ee72f81b31f0627dbfc69f50c97378f
parent a72c9512bf2bef12c5e66a4d910c4b348fe31d61
parent ce9d9b8e5c2b7486edf76958bcdb5e6534a915b0
author David S. Miller <davem@davemloft.net> 1445694852 -0700
committer David S. Miller <davem@davemloft.net> 1445694852 -0700

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

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

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