From: David S. Miller <davem@davemloft.net>
Date: Fri, 16 Sep 2016 00:27:30 +0000 (-0400)
Subject: Merge branch 'cls_flower-port-masks'
X-Git-Tag: v4.9-rc1~127^2~190
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=faef091c5a930a75586ebcb089ee9ad7c1eedaf3;p=linux.git

Merge branch 'cls_flower-port-masks'

Or Gerlitz says:

====================
net/sched: cls_flower: Add ports masks

This series adds the ability to specify tcp/udp ports masks
for TC/flower filter matches.

I also removed an unused fields from the flower keys struct
and clarified the format of the recently added vlan attibutes.

v1--> v2 changes:

 * fixes typo in patch #2 title and change log (Sergei)
 * added acks provided by Jiri on v1

FWIW, by mistake the cover letter of V1 (but not the patches)
carried V2 tag, hope this doesn't create too much confusion.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

faef091c5a930a75586ebcb089ee9ad7c1eedaf3