projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 567be78 d972477)
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)
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>

Trivial merge
Linux 6.x block layer and io_uring tree(s)