mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Craig Shelley <craig@microtron.org.uk>,
	Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: linux-next: manual merge of the usb tree with the ttydev tree
Date: Wed, 3 Jun 2009 18:07:34 +1000	[thread overview]
Message-ID: <20090603180734.f175e04f.sfr@canb.auug.org.au> (raw)

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/cp210x.c between commit
d6ba273795c1260745197dc93f64c321c80a5ecc ("tty-usb-use-port") from the
ttydev tree and commit fa9eb42aff8444a67db3136bc405a53882efb14f ("USB:
CP210X Replace CP2101 with CP210x") from the usb tree.

This is really just the same three commits being applied to both trees,
but the ttydev tree has the above commit preceding them.  Maybe Greg you
should rdop these patches ("USB: CP210X Add device IDs", "USB: CP210X Use
official request code definitions", and "USB: CP210X Replace CP2101 with
CP210x") is Craig can verify that they are indeed identical in both trees
(I know the first two are, but the last is different due to the other
changes in the ttydev tree).

As a side issue, the last patch has no SOB from Craig in the ttydev tree.

So, I just used the ttydev tree version on the assumption that my
reasoning above is correct.
-- 
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-06-03  8:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-03  8:07 Stephen Rothwell [this message]
2009-06-03  8:55 ` Alan Cox
2009-06-03 10:46   ` Stephen Rothwell
2009-06-03 15:00     ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2009-06-10  8:41 Stephen Rothwell
2009-06-10 10:06 ` Alan Cox
2009-06-10 11:09   ` Stephen Rothwell
2009-06-05  5:41 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-05  5:34 Stephen Rothwell
2009-06-05 17:42 ` Greg KH
2009-06-03  8:13 Stephen Rothwell
2009-06-03  7:55 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=20090603180734.f175e04f.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=craig@microtron.org.uk \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.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
all inboxes | Powered by JetHome®