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
| ||
|
Date: Sat, 24 Oct 2015 06:55:56 -0700 (PDT) From: David Miller <davem@...emloft.net> To: pshelar@...ira.com CC: joestringer@...ira.com, netdev@...r.kernel.org Subject: 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 did my best to resolve the conflicts, but if someone would double check my work I would really appreciate it. Thanks. -- 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
Powered by blists - more mailing lists