From: Greg KH <greg@kroah.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Oliver Neukum <oliver@neukum.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Tue, 28 Jul 2009 09:34:20 -0700 [thread overview]
Message-ID: <20090728163420.GB14899@kroah.com> (raw)
In-Reply-To: <20090728163222.GA14899@kroah.com>
On Tue, Jul 28, 2009 at 09:32:22AM -0700, Greg KH wrote:
> On Tue, Jul 28, 2009 at 02:17:40PM +0100, Alan Cox wrote:
> > On Tue, 28 Jul 2009 22:35:04 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > Hi Alan,
> > >
> > > On Tue, 28 Jul 2009 13:29:11 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> > > >
> > > > I need to look at the actual diff, but the combination looks completely
> > > > bogus unless I'm misreading the fixup which is possible.
> > >
> > > Below is the actual patch from the usb.current tree.
> >
> > Thanks - ok that is probably safe. The change I was worried about (the
> > error paths not adjusting port->count are ok as it gets zeroed within the
> > mutex)
> >
> > Not sure its safe versus hangup but neither was the old code 8)
> >
> > Oliver: I'll send you an alternative patch later today/tomorrow that uses
> > the ASYNC flags.
>
> Should I just drop Oliver's existing patch from my tree for now then?
Ok, in order to get a good merge for today, I've dropped it now.
Oliver, care to work with Alan to get something that is agreeable to
everyone?
thanks,
greg k-h
next prev parent reply other threads:[~2009-07-28 16:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 4:01 linux-next: manual merge of the ttydev tree with the usb.current tree Stephen Rothwell
2009-07-28 10:26 ` Alan Cox
2009-07-28 12:10 ` Oliver Neukum
2009-07-28 12:29 ` Alan Cox
2009-07-28 12:35 ` Stephen Rothwell
2009-07-28 13:17 ` Alan Cox
2009-07-28 16:32 ` Greg KH
2009-07-28 16:34 ` Greg KH [this message]
2009-07-28 19:21 ` Oliver Neukum
2009-07-28 19:24 ` Alan Cox
-- strict thread matches above, loose matches on Subject: below --
2009-07-09 3:04 Stephen Rothwell
2009-07-09 23:19 ` Greg KH
2009-07-10 0:06 ` Stephen Rothwell
2009-07-10 0:13 ` Greg KH
2009-04-23 4:49 Stephen Rothwell
2009-04-23 4:34 Stephen Rothwell
2009-04-23 4:30 Stephen Rothwell
2009-04-22 3:38 Stephen Rothwell
2009-04-22 15:50 ` Alan Stern
2009-04-22 16:30 ` Alan Cox
2009-04-22 16:38 ` Greg KH
2009-04-28 4:42 ` Stephen Rothwell
2009-04-28 4:58 ` Greg KH
2009-04-28 6:45 ` Stephen Rothwell
2009-03-12 4:04 Stephen Rothwell
2009-03-12 9:44 ` Alan Cox
2009-03-12 11:02 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090728163420.GB14899@kroah.com \
--to=greg@kroah.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).