From: David S. Miller <davem@davemloft.net>
Date: Fri, 29 Oct 2021 12:25:32 +0000 (+0100)
Subject: Merge branch 'nfp-fixes'
X-Git-Tag: block-5.16-2021-11-13~96^2~1^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0f48fb6607ead7caed0eb7f4bd41d720da58525b;p=linux-block.git

Merge branch 'nfp-fixes'

Simon Horman says:

====================
nfp: fix bugs caused by adaptive coalesce

this series contains fixes for two bugs introduced when
when adaptive coalesce support was added to the NFP driver in
v5.15 by 9d32e4e7e9e1 ("nfp: add support for coalesce adaptive feature")
====================

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

0f48fb6607ead7caed0eb7f4bd41d720da58525b