From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: linux-next: manual merge of the net-next tree with the net tree Date: Tue, 12 Jan 2016 15:20:25 -0500 (EST) Message-ID: <20160112.152025.2172413970912429668.davem@davemloft.net> References: <20160112131505.2228f559@canb.auug.org.au> <20160112091102.GA12607@colbert.idosch.org> <20160112225811.2c70c1a4@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: idosch@mellanox.com, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, jiri@mellanox.com To: sfr@canb.auug.org.au Return-path: In-Reply-To: <20160112225811.2c70c1a4@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Stephen Rothwell Date: Tue, 12 Jan 2016 22:58:11 +1100 > Hi Ido, > > On Tue, 12 Jan 2016 11:11:02 +0200 Ido Schimmel wrote: >> >> The lock can be moved further down, just before mlxsw_reg_sfd_pack. >> Other than that everything looks fine. Thank you! > > Thanks, I wasn't sure but I will do that tomorrow (unless Dave beats me to it). I did the merge but did not move the locking. Feel free to send me a patch to do so.