* linux-next: manual merge of the tty tree with the microblaze tree
@ 2010-09-03 3:02 Stephen Rothwell
2010-09-03 3:27 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-03 3:02 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Michal Simek, Jason Wessel
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the tty tree with the microblaze tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-09-03 3:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Michal Simek, Jason Wessel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-03 3:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).