diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-23 11:59:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-23 11:59:57 -0500 |
| commit | 9aa340a5c36eafa847861336db446886a5ed1962 (patch) | |
| tree | 98863f3ad1541e041d7a043f2f46005e45cd3fbd /COPYING | |
| parent | 567be786597ca24b13906a552ad2159316c6fe7d (diff) | |
| parent | d9724772e69cb8076231202292665ca74eec13e1 (diff) | |
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions