From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Mar 2020 04:12:40 +0000 (-0700)
Subject: Merge branch 'nfp-type'
X-Git-Tag: v5.7-rc1~146^2~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24ee86511b01f73a1ef1dd8a8a2e685e5ec03bfe;p=thirdparty%2Flinux.git

Merge branch 'nfp-type'

Jakub Kicinski says:

====================
net: rename flow_action stats and set NFP type

Jiri, I hope this is okay with you, I just dropped the "type" from
the helper and value names, and now things should be able to fit
on a line, within 80 characters.

Second patch makes the NFP able to offload DELAYED stats, which
is the type it supports.
====================

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

24ee86511b01f73a1ef1dd8a8a2e685e5ec03bfe