| commit | fd9527f404d51e50f40dac0d9a69f2eff3dac33e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Sep 17 10:13:16 2016 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Sep 17 10:13:16 2016 -0400 |
| tree | 6a13c4e0b613b960b60c1dfe46c6209b49ef1605 | |
| parent | eb94737d711913a23e466b99c0d9ffdf15651290 [diff] | |
| parent | 173ca26e9b5136faa82dee37c77cbfb36974d079 [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>