diff options
| author | David S. Miller <[email protected]> | 2016-12-23 16:59:57 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2016-12-23 16:59:57 +0000 |
| commit | 9aa340a5c36eafa847861336db446886a5ed1962 (patch) | |
| tree | 98863f3ad1541e041d7a043f2f46005e45cd3fbd /scripts/gcc-plugins/cyc_complexity_plugin.c | |
| parent | stmmac: CSR clock configuration fix (diff) | |
| parent | net/sched: cls_flower: Mandate mask when matching on flags (diff) | |
| download | kernel-9aa340a5c36eafa847861336db446886a5ed1962.tar.gz kernel-9aa340a5c36eafa847861336db446886a5ed1962.zip | |
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 <[email protected]>
Diffstat (limited to 'scripts/gcc-plugins/cyc_complexity_plugin.c')
0 files changed, 0 insertions, 0 deletions