From: David S. Miller Date: Sat, 17 Sep 2016 14:13:16 +0000 (-0400) Subject: Merge branch 'ip_tunnel-collect_md' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd9527f404d51e50f40dac0d9a69f2eff3dac33e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- fd9527f404d51e50f40dac0d9a69f2eff3dac33e