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 Cox <alan@linux.intel.com>
Subject: Re: linux-next: manual merge of the usb tree with the tty tree
Date: Wed, 19 Sep 2012 08:17:05 +0100 [thread overview]
Message-ID: <20120919071705.GC16905@kroah.com> (raw)
In-Reply-To: <20120919141636.99298d4d5e8501ec377e5594@canb.auug.org.au>
On Wed, Sep 19, 2012 at 02:16:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/io_edgeport.c between commit adc8d746caa6 ("tty: move
> the termios object into the tty") from the tty tree and commit
> 984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") from the
> usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks correct to me, thanks for the fix.
greg k-h
next prev parent reply other threads:[~2012-09-19 7:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 4:16 linux-next: manual merge of the usb tree with the tty tree Stephen Rothwell
2012-09-19 7:17 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-26 3:49 Stephen Rothwell
2013-03-26 21:29 ` Greg KH
2013-01-28 10:13 Stephen Rothwell
2013-01-28 14:45 ` 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=20120919071705.GC16905@kroah.com \
--to=greg@kroah.com \
--cc=alan@linux.intel.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 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.