From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Jul 2021 20:36:35 +0000 (-0700)
Subject: Merge branch 'nfp-ct-fixes'
X-Git-Tag: v5.15~716^2~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99f47ea437c113df0fb640ea87e0efd3838510aa;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'nfp-ct-fixes'

Simon Horman says:

====================
small tc conntrack fixes

Louis Peens says:

The first patch makes sure that any callbacks registered to
the ct->nf_tables table are cleaned up before freeing.

The second patch removes what was effectively a workaround
in the nfp driver because of the missing cleanup in patch 1.
====================

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

99f47ea437c113df0fb640ea87e0efd3838510aa