projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb94737
173ca26
)
Merge branch 'ip_tunnel-collect_md'
author
David S. Miller
<davem@davemloft.net>
Sat, 17 Sep 2016 14:13:16 +0000
(10:13 -0400)
committer
David 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
projects / openwrt / staging / blogic.git / commitdiff