[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130130133240.GA16591@kroah.com>
Date: Wed, 30 Jan 2013 14:32:40 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: Peter Hurley <peter@...leysoftware.com>
Cc: linux1394-devel@...ts.sourceforge.net,
linux-kernel@...r.kernel.org,
Stefan Richter <stefanr@...6.in-berlin.de>
Subject: Re: [PATCH 10/11] staging/fwserial: Fix premature unthrottle
On Wed, Jan 30, 2013 at 08:11:05AM -0500, Peter Hurley wrote:
> On Tue, 2013-01-29 at 23:29 -0500, Greg Kroah-Hartman wrote:
> > On Mon, Jan 28, 2013 at 10:34:44PM -0500, Peter Hurley wrote:
> > > The unthrottle may restart the writer before the rx push
> > > has a chance to start emptying the rx buffer, resulting in an
> > > overflowed rx buffer and lost data.
> > >
> > > Perform the actual device unthrottle with the rx push instead.
> > >
> > > Signed-off-by: Peter Hurley <peter@...leysoftware.com>
> > > ---
> > > drivers/staging/fwserial/fwserial.c | 30 ++++++++++++++----------------
> > > 1 file changed, 14 insertions(+), 16 deletions(-)
> >
> > this patch fails to apply to my tree, but the 9 previous ones were fine,
> > so I'll not apply it, or ght 11/11 patch. Care to fix it up and resend
> > both of them?
>
> Hi Greg,
>
> I can rebase these against your staging-next, if you'd prefer, but it
> will make the -next merge non-trivial.
>
> Your tty-next tree is carrying patches to this driver from patch series
> "TTY: switch flipping functions to tty_port"
> which is already in -next.
>
> Let me know what you'd like me to do.
Ugh, that's a mess.
Can these wait until after 3.9-rc1 is out? If so, things should get
synced up by then. Otherwise I'll have to figure out how to handle the
merge properly...
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists