openvswitch: net --> net-next merge

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

Re: openvswitch: net --> net-next merge

On Sat, Oct 24, 2015 at 6:55 AM, David Miller 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