projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb94737 173ca26)
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)
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>

Trivial merge