From: David S. Miller Date: Fri, 23 Dec 2016 16:59:57 +0000 (-0500) Subject: Merge branch 'cls_flower-act_tunnel_key-fixes' X-Git-Tag: v5.4.17~9374^2~6 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9aa340a5c36eafa847861336db446886a5ed1962;p=arm%2Flinux.git Merge branch 'cls_flower-act_tunnel_key-fixes' Or Gerlitz says: ==================== net/sched fixes for cls_flower and act_tunnel_key This small series contain a fix to the matching flags support in flower and to the tunnel key action MD prep for IPv6. ==================== Signed-off-by: David S. Miller --- 9aa340a5c36eafa847861336db446886a5ed1962