]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge branch 'act_ct-software-offload-of-established-flows-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2020 19:05:04 +0000 (11:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2020 19:05:04 +0000 (11:05 -0800)
Paul Blakey says:

====================
Fixes for tc act_ct software offload of established flows (diff v4->v6)

v4 of the original patchset was accidentally merged while we moved ahead
with v6 review. This two patches are the diff between v4 that was merged and
v6 that was the final revision, which was acked by the community.
====================

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

Trivial merge