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,
Michal Simek <michal.simek@petalogix.com>,
Jason Wessel <jason.wessel@windriver.com>
Subject: Re: linux-next: manual merge of the tty tree with the microblaze tree
Date: Thu, 2 Sep 2010 20:27:18 -0700 [thread overview]
Message-ID: <20100903032718.GA13847@kroah.com> (raw)
In-Reply-To: <20100903130236.1f5f331c.sfr@canb.auug.org.au>
On Fri, Sep 03, 2010 at 01:02:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/serial/uartlite.c between commit
> 52ea4a7ef12f286bd68d13a93daaa688f56a1e14 ("serial: Add CONSOLE_POLL
> support for uartlite") from the microblaze tree and commit
> 0e5176373d9c9a7741b54ce81a9eea342291bdca ("serial: Add CONSOLE_POLL
> support for uartlite") from the tty tree.
>
> The same, but slightly different patch. I used the version from the tty
> tree.
Yes please, that's the version that works :)
Can someone drop it from the microblaze tree please?
thanks,
greg k-h
prev parent reply other threads:[~2010-09-03 3:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-03 3:02 linux-next: manual merge of the tty tree with the microblaze tree Stephen Rothwell
2010-09-03 3:27 ` 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=20100903032718.GA13847@kroah.com \
--to=greg@kroah.com \
--cc=jason.wessel@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@petalogix.com \
--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).