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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CALnjE+rBUPaKB1MHvscAEgUwwZAG+HSRJeN3RgVwmzw++gvfqg@mail.gmail.com>
Date:	Sat, 24 Oct 2015 17:20:14 -0700
From:	Pravin Shelar <pshelar@...ira.com>
To:	David Miller <davem@...emloft.net>
Cc:	Joe Stringer <joestringer@...ira.com>,
	netdev <netdev@...r.kernel.org>
Subject: Re: openvswitch: net --> net-next merge

On Sat, Oct 24, 2015 at 6:55 AM, David Miller <davem@...emloft.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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html