From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756104AbcEQQEJ (ORCPT ); Tue, 17 May 2016 12:04:09 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:40534 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755364AbcEQQEH (ORCPT ); Tue, 17 May 2016 12:04:07 -0400 Date: Tue, 17 May 2016 18:03:58 +0200 From: Andrew Lunn To: Vivien Didelot Cc: David Miller , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, f.fainelli@gmail.com, jiri@resnulli.us Subject: Re: [PATCH net] net: dsa: mv88e6xxx: remove bridge work Message-ID: <20160517160358.GC26948@lunn.ch> References: <1463186303-3139-1-git-send-email-vivien.didelot@savoirfairelinux.com> <8737plig1v.fsf@ketchup.mtl.sfl> <20160516.134823.1909596879203571371.davem@davemloft.net> <87r3d01yok.fsf@ketchup.mtl.sfl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87r3d01yok.fsf@ketchup.mtl.sfl> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 17, 2016 at 11:39:23AM -0400, Vivien Didelot wrote: > Hi David, > > David Miller writes: > > > From: Vivien Didelot > > Date: Fri, 13 May 2016 21:28:28 -0400 > > > >> Hi David, > >> > >> Vivien Didelot writes: > >> > >>> Now that the bridge code defers the switchdev port state setting, there > >>> is no need to defer the port STP state change within the mv88e6xxx code. > >>> Thus get rid of the driver's bridge work code. > >>> > >>> This also fixes a race condition where the DSA layer assumes that the > >>> bridge code already set the unbridged port's STP state to Disabled > >>> before restoring the Forwarding state. > >>> > >>> As a consequence, this also fixes the FDB flush for the unbridged port > >>> which now correctly occurs during the Forwarding to Disabled transition. > >>> > >>> Fixes: 0bc05d585d38 ("switchdev: allow caller to explicitly request attr_set as deferred") > >>> Reported-by: Andrew Lunn > >>> Signed-off-by: Vivien Didelot > >> > >> This patch doesn't apply to -net, only applies to net-next... > >> > >> How should I handle that, do I resend a patch for net-next with the good > >> subject prefix, and a v2 for -net? > > > > I applied this to net-next, thanks. > > Do we want to send this fix to -net as well? Hi Vivien I don't see this bug as being highly critical that it needs to be fixed immediately. I would suggest we wait until -rc1 is out, and then produce a backport version. Given the changes we have made to that driver, there is little chance the existing fix will cherry-pick backwards. Andrew