From: David S. Miller Date: Sun, 17 Mar 2013 16:58:47 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch X-Git-Tag: v5.15~20166^2~443 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86feff3f3eb643cc5735d414e46a8201a8c67b8f;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'master' of git://git./linux/kernel/git/jesse/openvswitch Conflicts: net/openvswitch/vport-internal_dev.c Jesse Gross says: ==================== 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. ==================== Signed-off-by: David S. Miller --- 86feff3f3eb643cc5735d414e46a8201a8c67b8f