From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jason Wessel <jason.wessel@windriver.com>
Subject: Re: linux-next: manual merge of the ttydev tree with the usb.current tree
Date: Thu, 9 Jul 2009 17:13:18 -0700 [thread overview]
Message-ID: <20090710001318.GA1582@kroah.com> (raw)
In-Reply-To: <20090710100625.13e75cfd.sfr@canb.auug.org.au>
On Fri, Jul 10, 2009 at 10:06:25AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Thu, 9 Jul 2009 16:19:56 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Jul 09, 2009 at 01:04:30PM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the ttydev tree got conflicts in
> > > drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
> > > d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
> > > move sysrq from hot path") from the usb.current tree and commit
> > > cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
> > > from the ttydev tree. Also between commit
> > > a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
> > > function calls") from the usb.current tree and commit
> > > bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
> > > the ttydev tree.
> > >
> > > The first two commits above seem to be trying to do the same thing (or
> > > similar) so I have used the ttydev version for now.
> > >
> > > I fixed them up (see below) and can carry the fixes as necessary.
> >
> > Thanks for the fix, I don't know what happened in the tty tree, I've not
> > touched the USB tree for a week or so now...
>
> In case you missed it, Alan has submitted the above two ttydev patches to
> Linus.
Ah, thanks, I'll handle the merge when they hit Linus's tree.
greg k-h
next prev parent reply other threads:[~2009-07-10 0:13 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-09 3:04 linux-next: manual merge of the ttydev tree with the usb.current tree Stephen Rothwell
2009-07-09 23:19 ` Greg KH
2009-07-10 0:06 ` Stephen Rothwell
2009-07-10 0:13 ` Greg KH [this message]
-- 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-04-23 4:49 Stephen Rothwell
2009-04-23 4:34 Stephen Rothwell
2009-04-23 4:30 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=20090710001318.GA1582@kroah.com \
--to=greg@kroah.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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).