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,
Feng Tang <feng.tang@intel.com>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Paul Mundt <lethal@linux-sh.org>
Subject: Re: linux-next: manual merge of the tty tree with the genesis tree
Date: Mon, 26 Jul 2010 21:47:05 -0700 [thread overview]
Message-ID: <20100727044705.GA16378@kroah.com> (raw)
In-Reply-To: <20100727143430.05c018fc.sfr@canb.auug.org.au>
On Tue, Jul 27, 2010 at 02:34:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> include/linux/serial_core.h between commit
> 75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
> found on some sh-mobile SoCs") from the genesis tree and commit
> c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
> Speed UART device") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, the fix looks fine.
greg k-h
next prev parent reply other threads:[~2010-07-27 4:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 4:34 linux-next: manual merge of the tty tree with the genesis tree Stephen Rothwell
2010-07-27 4:47 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-09 3:49 Stephen Rothwell
2010-07-09 5:04 ` Greg KH
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=20100727044705.GA16378@kroah.com \
--to=greg@kroah.com \
--cc=feng.tang@intel.com \
--cc=g.liakhovetski@gmx.de \
--cc=lethal@linux-sh.org \
--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.