From: David S. Miller Date: Tue, 7 Jan 2014 00:48:38 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch X-Git-Tag: firefly_0821_release~176^2~4570^2~265 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33;p=firefly-linux-kernel-4.4.55.git Merge branch 'master' of git://git./linux/kernel/git/jesse/openvswitch Jesse Gross says: ==================== [GIT net-next] Open vSwitch Open vSwitch changes for net-next/3.14. Highlights are: * Performance improvements in the mechanism to get packets to userspace using memory mapped netlink and skb zero copy where appropriate. * Per-cpu flow stats in situations where flows are likely to be shared across CPUs. Standard flow stats are used in other situations to save memory and allocation time. * A handful of code cleanups and rationalization. ==================== Signed-off-by: David S. Miller --- 39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33