Merge branch 'nfp-whitespace-sync-and-flower-TCP-flags'
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Feb 2018 21:24:24 +0000 (16:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Feb 2018 21:24:24 +0000 (16:24 -0500)
commita73d65b5cd1c766fc64db59d18255923d01e92db
treec1e93fca144dc3b2a84b550fcd0ac34f1db3a9f1
parent4a8864822d74b351239f6e24b3468d47dc391f7f
parentffa61202fe2972577794004f79652360b5f4ddb0
Merge branch 'nfp-whitespace-sync-and-flower-TCP-flags'

Jakub Kicinski says:

====================
nfp: whitespace sync and flower TCP flags

Whitespace cleanup from Michael and flower offload support for matching
on TCP flags from Pieter.
====================

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