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,
Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: linux-next: manual merge of the tty tree with the i.MX tree
Date: Thu, 3 Feb 2011 20:20:47 -0800 [thread overview]
Message-ID: <20110204042047.GA3331@kroah.com> (raw)
In-Reply-To: <20110204151408.9988102e.sfr@canb.auug.org.au>
On Fri, Feb 04, 2011 at 03:14:08PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/Kconfig between commit
> 47d37d6f94ccf32d302492f969209930b2411f9e ("serial: Add auart driver for
> i.MX23/28") from the i.M tree and commit
> 4564e1ef219fa69ed827fe2613569543a6b26fbc ("serial: pch_uart: support new
> device ML7213") from the tty tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Looks good to me, thanks for handling this.
greg k-h
prev parent reply other threads:[~2011-02-04 4:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-04 4:14 linux-next: manual merge of the tty tree with the i.MX tree Stephen Rothwell
2011-02-04 4:20 ` Greg KH [this message]
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=20110204042047.GA3331@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sfr@canb.auug.org.au \
--cc=tomoya-linux@dsn.okisemi.com \
/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.