From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Stern <stern@rowland.harvard.edu>,
Craig Shelley <craig@microtron.org.uk>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the ttydev tree
Date: Fri, 5 Jun 2009 10:42:03 -0700 [thread overview]
Message-ID: <20090605174203.GD6479@kroah.com> (raw)
In-Reply-To: <20090605153445.291acd58.sfr@canb.auug.org.au>
On Fri, Jun 05, 2009 at 03:34:45PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/cp210x.c between commit
> 7219905ae9bb14e9c8f7a7ab434b70363b904a7c ("cp210x-func-renames") from the
> ttydev tree and commit 8a5870836006ec7dd112082a39e0057b49e5bd91 ("USB:
> usb-serial: replace shutdown with disconnect, release") from the usb tree.
>
> I love churn! :-)
Heh, so do I :)
> I fixed this up (see below) and can carry the fix as necessary.
Looks good to me, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2009-06-05 17:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-05 5:34 linux-next: manual merge of the usb tree with the ttydev tree Stephen Rothwell
2009-06-05 17:42 ` Greg KH [this message]
-- 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-03 8:13 Stephen Rothwell
2009-06-03 8:07 Stephen Rothwell
2009-06-03 8:55 ` Alan Cox
2009-06-03 10:46 ` Stephen Rothwell
2009-06-03 15:00 ` Greg KH
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=20090605174203.GD6479@kroah.com \
--to=greg@kroah.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=craig@microtron.org.uk \
--cc=linux-kernel@vger.kernel.org \
--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 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.