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,
Jiri Slaby <jslaby@suse.cz>, Johan Hovold <jhovold@gmail.com>
Subject: Re: linux-next: manual merge of the usb tree with the tty tree
Date: Tue, 26 Mar 2013 14:29:32 -0700 [thread overview]
Message-ID: <20130326212932.GA27132@kroah.com> (raw)
In-Reply-To: <20130326144932.aae6ea8285bba0a98b0b6193@canb.auug.org.au>
On Tue, Mar 26, 2013 at 02:49:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/usb-serial.c between commit 6aad04f21374 ("TTY: add
> tty_port_tty_wakeup helper") from the tty tree and commit d12e211d4484
> ("USB: serial: clean up debug info") from the usb tree.
>
> I fixed it up (I just used the version of usb_serial_port_work() from the
> tty tree - see below) and can carry the fix as necessary (no action is
> required).
Looks correct, thanks.
greg k-h
next prev parent reply other threads:[~2013-03-26 21:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-26 3:49 linux-next: manual merge of the usb tree with the tty tree Stephen Rothwell
2013-03-26 21:29 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-28 10:13 Stephen Rothwell
2013-01-28 14:45 ` Greg KH
2012-09-19 4:16 Stephen Rothwell
2012-09-19 7:17 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:31 Stephen Rothwell
2012-09-17 7:30 Stephen Rothwell
2012-09-17 7:30 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=20130326212932.GA27132@kroah.com \
--to=greg@kroah.com \
--cc=jhovold@gmail.com \
--cc=jslaby@suse.cz \
--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 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.