]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'geneve'
authorDavid S. Miller <davem@davemloft.net>
Mon, 6 Oct 2014 04:32:25 +0000 (00:32 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Oct 2014 04:32:25 +0000 (00:32 -0400)
commite036cec1281fb131f16f36721e9e813b59ec7046
treea4906c8cba2b6c2d116e7b72a71f9e1020b476cb
parent4d61c5d3aaaa2630d83a948b5e2b82be11061a15
parentfeacd8988127a1ee3f93b7c5417c65c3dc4c0e80
Merge branch 'geneve'

Andy Zhou says:

====================
Add Geneve tunnel protocol support

This patch series adds kernel support for Geneve (Generic Network
Virtualization Encapsulation) based on Geneve IETF draft:
http://www.ietf.org/id/draft-gross-geneve-01.txt

Patch 1 implements Geneve tunneling protocol driver

Patch 2-6 adds openvswitch support for creating and using
Geneve tunnels by OVS user space.

v1->v2:   Style fixes: use tab instead space for Kconfig
  Patch 2-6 are reviewed by Pravin Shetty, add him to acked-by
  Patch 6 was reviewed by Thomas Graf when commiting
    to openvswitch.org, add him to acked-by.
====================

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