Merge branch 'cls_flower-act_tunnel_key-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2016 16:59:57 +0000 (11:59 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Dec 2016 16:59:57 +0000 (11:59 -0500)
commit9aa340a5c36eafa847861336db446886a5ed1962
tree98863f3ad1541e041d7a043f2f46005e45cd3fbd
parent567be786597ca24b13906a552ad2159316c6fe7d
parentd9724772e69cb8076231202292665ca74eec13e1
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 <davem@davemloft.net>