From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Apr 2017 17:21:32 +0000 (-0400)
Subject: Merge branch 'iptunnel-policy-based-routing'
X-Git-Tag: v4.12-rc1~129^2~142
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20da848f8e5c2d911ee65dda1776d0f2a2408e01;p=users%2Fhch%2Fuuid.git

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>
---

20da848f8e5c2d911ee65dda1776d0f2a2408e01