linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org, Oliver Neukum <oliver@neukum.org>,
	Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Thu, 23 Apr 2009 14:30:29 +1000	[thread overview]
Message-ID: <20090423143029.8a0529f9.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/cypress_m8.c between commit
3355625b2b58b213e481b071aa01d15240f0d8dd ("USB: removal of
tty->low_latency hack dating back to the old serial code") from the
usb.current tree and commit 1156df675ae541b21dc343912413f201f87a3909
("tty-usb-use-port") from the ttydev tree.

Each patch just removes code next to the code removed by the other.  I
fixed it up and can carry the fix. as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

             reply	other threads:[~2009-04-23  4:30 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-23  4:30 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
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
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-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=20090423143029.8a0529f9.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=greg@kroah.com \
    --cc=linux-next@vger.kernel.org \
    --cc=oliver@neukum.org \
    /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).