On Thu, Aug 22, 2013 at 3:09 AM, James Page <james.p...@ubuntu.com> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > On 21/08/13 18:01, Jesse Gross wrote: >>> On 21/08/13 17:16, Jesse Gross wrote: >>>>>>>>>> What's the status of OVS 1.12? Is this just a dev >>>>>>>>>> branch or is it planned for release? >>>>>> It's actually a dead branch. It looks like we're going to >>>>>> get a few more things in and call the version after 1.11 >>>>>> 2.0. >>>> >>>> OK - so it sounds like I should be landing a snapshot based on >>>> the 1.11 branch into Ubuntu Saucy - albeit with the cherry >>>> picks for 3.10 and my patch for 3.11 ontop... >>>> >>>> Is that correct? >> That sounds right to me. > > Great - it was a bit more complex than for the 1.12 branch as the GRE > restructuring changes are not present in branch-1.11 and I needed > those for the 3.11 support; here's the full list of picks I made: > > c405d282fb7dda49b0aaac12a30121e5f2762b16 tunneling: Remove struct > tnl_vport and tnl_ops. > 806b46ef3d1f3e17e87d91c4fb0041aa87709497 datapath: Move vport init to > first port create. > db0c31340fe260f281aaea07b0fbce41bef07c7d datapath: Kill VPORT_F_TUN_ID > vport flag. > 3cfede14890f1fae3a8faf7ba179018201079dc6 datapath: make skb->csum > consistent with rest of networking stack. > 1a02b7689b01db7fff2cda87ac311389ff524283 datapath: Use a single > attribute array for parsing values and masks. > 5ebaf571f9a3531d06eb52b62ac237ab7292f7b0 gre: Restructure tunneling. > 20fcf338fe89483a600958c6e01767ee064513ce datapath: Support for Linux > kernel 3.9. > 9b764edf063160f3428b85cc0a1bb52bd3f51061 datapath: Support for Linux > kernel 3.10 > 47916a6442392a93a0212e8e817953339fbf5f21 datapath: Rename > skb_network_protocol() to __skb_network_protocol() > 6d3e8965a2f1a4ff31db6f559d1e07f6b70e54b8 datapath: Fix uninitializaed > variable with GRE GSO. > 2be0b371712ddf1fc2aaac81672b2196b6df891f datapath: Make GRE support > conditional on CONFIG_NET_IPGRE_DEMUX. > > and my patch for 3.11 support which I just submitted to the dev ML: > > ee66c2d5b852e7fee899de60463ac97789a79cea datapath: Add support for > Linux 3.11 > > Would the picks above be accepted onto the 1.11 branch?
I would be very hesitant to put these on branch-1.11. We're very close to release there and this is major code restructuring. If you really want to go down this path, then I think it would be better to just pick up the kernel code in master since it's basically the same thing and there will be a lower chance of missing something. However, I'm sure that there is a much more minimal change that would allow 1.11 to support the newer kernels and that would seem the right thing to do. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
