From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753903AbbCLJ7H (ORCPT <rfc822;w@1wt.eu>);
	Thu, 12 Mar 2015 05:59:07 -0400
Received: from mail.linuxfoundation.org ([140.211.169.12]:33337 "EHLO
	mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753526AbbCLJ67 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 12 Mar 2015 05:58:59 -0400
Date: Thu, 12 Mar 2015 10:58:54 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Quentin Lambert <lambert.quentin@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
        Giedrius =?utf-8?Q?Statkevi=C4=8Dius?= 
	<giedrius.statkevicius@gmail.com>,
        Lidza Louina <lidza.louina@gmail.com>,
        Mark Hounschell <markh@compro.net>, devel@driverdev.osuosl.org,
        driverdev-devel@linuxdriverproject.org,
        kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] Staging: dgnc: Use goto for error handling
Message-ID: <20150312095854.GA3682@kroah.com>
References: <20150311140433.GA17051@sloth>
 <55006F4A.70805@gmail.com>
 <20150312092711.GX10964@mwanda>
 <55015D38.5060100@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <55015D38.5060100@gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Mar 12, 2015 at 10:32:40AM +0100, Quentin Lambert wrote:
> 
> 
> On 12/03/2015 10:27, Dan Carpenter wrote:
> >On Wed, Mar 11, 2015 at 06:37:30PM +0200, Giedrius Statkevičius wrote:
> >>It's still not in staging-testing for some reason :(
> >>
> >It can take several weeks to get merged.  Relax.
> >
> >regards,
> >dan carpenter
> >
> What should i do concerning that ?
> I need to send a second version of this patch anyway to fix the
> fact that i inverted 2 statements, namely:
> 
> +exit_unlock:
> +	if (ld)
> +		tty_ldisc_deref(ld);
> +	spin_unlock_irqrestore(&ch->ch_lock, flags);
> 
> should be
> 
> +exit_unlock:
> +	spin_unlock_irqrestore(&ch->ch_lock, flags);
> +	if (ld)
> +		tty_ldisc_deref(ld);
> 
> Should I wait these several weeks to send the second version or should
> I send a second version fixing this issue a wait for someone to ask me
> to solve the conflict ?

Just wait a bit, I should catch up on patches in this area soon, and I
will let everyone know if patches do not apply.

thanks,

greg k-h