OSDN Git Service

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)
commitef71037047b0cc192b661608e2021de828cd82b1
treeae8b8d5c9207e8bdda7fe8780f6f0791a4ac96d4
parent97ec3b21b207dc7713877f5ef2ae74c879be0c84
parent4cc5fdec6dfe92f50ef2c6a565dfce694161c769
Merge branch 'act_ct-software-offload-of-established-flows-fixes'

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>