All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
	linux-next@vger.kernel.org,
	Axel Wachtler <axel.wachtler@atmel.com>,
	Michael Hennerich <michael.hennerich@analog.com>
Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Thu, 12 Mar 2009 09:44:34 +0000	[thread overview]
Message-ID: <20090312094434.4caaa695@lxorguk.ukuu.org.uk> (raw)
In-Reply-To: <20090312150455.e5ab0a56.sfr@canb.auug.org.au>

> Today's linux-next merge of the ttydev tree got conflicts in
> drivers/usb/serial/ftdi_sio.c and drivers/usb/serial/ftdi_sio.h.  It
> looks like the same two patches have been applied to the ttydev
> (tty-ftdi-gnice, tty-ftdi-dresdenelec) and the usb.current (USB: serial:

These are USB identifier updates to a USB driver that's also a tty
driver. I'll drop them in favour of GregKH's tree carring them.

  reply	other threads:[~2009-03-12  9:44 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-12  4:04 linux-next: manual merge of the ttydev tree with the usb.current tree Stephen Rothwell
2009-03-12  9:44 ` Alan Cox [this message]
2009-03-12 11:02   ` 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-04-23  4:30 Stephen Rothwell
2009-04-23  4:34 Stephen Rothwell
2009-04-23  4:49 Stephen Rothwell
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-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

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=20090312094434.4caaa695@lxorguk.ukuu.org.uk \
    --to=alan@lxorguk.ukuu.org.uk \
    --cc=axel.wachtler@atmel.com \
    --cc=greg@kroah.com \
    --cc=linux-next@vger.kernel.org \
    --cc=michael.hennerich@analog.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.