OK, I backported as far as 2.6. On 2.5, the original patch hadn't been applied, so there was nothing to revert.
On Tue, Apr 16, 2019 at 11:12:11AM -0700, Yifeng Sun wrote: > The more appropriate patch (7664423) mentioned in the revert message > was introduced in ovs-2.5. > So I think this revert patch should be backported to 2.5. > > Thanks, > Yifeng > > On Mon, Apr 15, 2019 at 4:08 PM Ben Pfaff <[email protected]> wrote: > > > > On Wed, Apr 03, 2019 at 03:34:34PM -0300, Flavio Leitner via dev wrote: > > > On Wed, Apr 03, 2019 at 09:49:13AM -0700, Yifeng Sun wrote: > > > > From: Flavio Leitner <[email protected]> > > > > > > > > Upstream commit: > > > > commit 7f6d6558ae44bc193eb28df3617c364d3bb6df39 > > > > Author: Flavio Leitner <[email protected]> > > > > Date: Fri Sep 28 14:55:34 2018 -0300 > > > > > > > > Revert "openvswitch: Fix template leak in error cases." > > > > This reverts commit 90c7afc. > > > > > > > > When the commit was merged, the code used nf_ct_put() to free > > > > the entry, but later on commit 7664423 ("openvswitch: Free > > > > tmpl with tmpl_free.") replaced that with nf_ct_tmpl_free which > > > > is a more appropriate. Now the original problem is removed. > > > > > > > > Then 44d6e2f ("net: Replace NF_CT_ASSERT() with WARN_ON().") > > > > replaced a debug assert with a WARN_ON() which is trigged now. > > > > > > > > Signed-off-by: Flavio Leitner <[email protected]> > > > > Acked-by: Joe Stringer <[email protected]> > > > > Signed-off-by: David S. Miller <[email protected]> > > > > > > > > This patch backports this upstream patch to OVS. > > > > > > > > Cc: Flavio Leitner <[email protected]> > > > > Signed-off-by: Yifeng Sun <[email protected]> > > > > --- > > > > > > LGTM > > > Acked-by: Flavio Leitner <[email protected]> > > > > I applied this to master. I would appreciate advice on backporting. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
