From: Jesse Gross <je...@nicira.com> Date: Fri, 15 Mar 2013 10:38:46 -0700
> A couple of minor enhancements for net-next/3.10. The largest is an > extension to allow variable length metadata to be passed to userspace > with packets. > > There is a merge conflict in net/openvswitch/vport-internal_dev.c: > A existing commit modifies internal_dev_mac_addr() and a new commit > deletes it. The new one is correct, so you can just remove that function. Pulled, thanks Jesse. Thanks, in particular, for the heads up about the merge conflict. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
