]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1bd88c 1159b00)
Merge branch 'ip_tunnel-collect_md'
authorDavid S. Miller <davem@davemloft.net>
Sat, 17 Sep 2016 14:13:16 +0000 (10:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 17 Sep 2016 14:13:16 +0000 (10:13 -0400)
commite61c984d03552d4eca192fee9edff6d6c1d77539
tree6a13c4e0b613b960b60c1dfe46c6209b49ef1605tree | snapshot
parentb1bd88cec0eb044a756a1759fc37e4674def54f9commit | diff
parent1159b00e7442ac7cbdec53246043017e5d8f1d59commit | diff
Merge branch 'ip_tunnel-collect_md'

Alexei Starovoitov says:

====================
ip_tunnel: add collect_md mode to IPv4/IPv6 tunnels

Similar to geneve, vxlan, gre tunnels implement 'collect metadata' mode
in ipip, ipip6, ip6ip6 tunnels.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Linux Kernel Source Tree.