From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Wed, 22 Apr 2009 17:30:09 +0100 [thread overview]
Message-ID: <20090422173009.4b6e684e@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <Pine.LNX.4.44L0.0904221142020.3405-100000@iolanthe.rowland.org>
> I'll be happy to help, although no doubt Alan Cox is quite capable of
> resolving the conflicts on his own.
Greg - can you send me the diff you applied in the end, then we can move
the patch from the USB tree into the tty tree otherwise its not going to
be possible to keep the two trees based on Linus base otherwise. Better
yet forcefeed it to Linus instead as its quite a icky bug and wants fixing
ASAP IMHO.
Alan
next prev parent reply other threads:[~2009-04-22 16:29 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-22 3:38 linux-next: manual merge of the ttydev tree with the usb.current tree Stephen Rothwell
2009-04-22 15:50 ` Alan Stern
2009-04-22 16:30 ` Alan Cox [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2009-07-28 4:01 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
2009-07-28 19:21 ` Oliver Neukum
2009-07-28 19:24 ` Alan Cox
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-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=20090422173009.4b6e684e@lxorguk.ukuu.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
/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).