Merge branch 'iptunnel-policy-based-routing'
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2017 17:21:32 +0000 (13:21 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Apr 2017 17:21:32 +0000 (13:21 -0400)
commit20da848f8e5c2d911ee65dda1776d0f2a2408e01
tree3b2affaea677fa909c286e43a5fab7dd156b76a0
parent8e6c1812e632ae3b54a1a9da759cad762f633e11
parent9830ad4c6a7f8db18d3b0933875937e36470987d
Merge branch 'iptunnel-policy-based-routing'

Craig Gallek says:

====================
ip_tunnel: Allow policy-based routing through tunnels

iproute2 changes to follow.  Example usage:
  ip link add gre-test type gre local 10.0.0.1 remote 10.0.0.2 fwmark 0x4
  ip -detail link show gre-test
  ...
  ip link set gre-test type gre fwmark 0
====================

Signed-off-by: David S. Miller <davem@davemloft.net>