]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar...
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2014 21:33:13 +0000 (16:33 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Nov 2014 21:33:13 +0000 (16:33 -0500)
Pravin B Shelar says:

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

First two patches are related to OVS MPLS support. Rest of patches
are mostly refactoring and minor improvements to openvswitch.

v1-v2:
 - Fix conflicts due to "gue: Remote checksum offload"
====================

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

Trivial merge