projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitfd9527f404d51e50f40dac0d9a69f2eff3dac33e
tree6a13c4e0b613b960b60c1dfe46c6209b49ef1605tree | snapshot
parenteb94737d711913a23e466b99c0d9ffdf15651290commit | diff
parent173ca26e9b5136faa82dee37c77cbfb36974d079commit | 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>
ep93xx device tree rework repo: git://git.maquefel.me/linux.git