On Sat, Oct 24, 2015 at 6:55 AM, David Miller <da...@davemloft.net> wrote: > > I needed to do a merge of 'net' into 'net-next' in order to > facilitate a set of tipc patches that I wanted to apply to > 'net-next'. > > There were several openvswitch merge conflicts, mostly to do with the > egress tunnel info bug fix conflicting with the simplification of the > vport ->send() method. > > I did my best to resolve the conflicts, but if someone would double > check my work I would really appreciate it. >
Resolved conflicts looks good. There is one minor issue where unused function (ovs_tunnel_route_lookup) is not removed, I will send out patch to fix it. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
