tree 031b87d6800ba69eab4f00c304472864e50c51d2
parent a2ae6007a442d6bb27d77bf20ec1b06cda9e306e
parent 05da5898a96c05e32aa9850c9cd89eef29471b13
author David S. Miller <davem@davemloft.net> 1415730745 -0500
committer David S. Miller <davem@davemloft.net> 1415730745 -0500

Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch

Pravin B Shelar says:

====================
Open vSwitch

Following batch of patches brings feature parity between upstream
ovs and out of tree ovs module.

Two features are added, first adds support to export egress
tunnel information for a packet. This is used to improve
visibility in network traffic. Second feature allows userspace
vswitchd process to probe ovs module features. Other patches
are optimization and code cleanup.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>