lkml.org 
[lkml]   [2013]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tty-next tree
On Tue, Oct 08, 2013 at 03:44:15PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the tty-next tree got a conflict in
>
> drivers/tty/serial/imx.c
>
> caused by commits e2c2725 (serial: imx: Use NULL as the last argument of
> add_preferred_console()) and b4e788d (Revert "serial: i.MX: evaluate
> linux,stdout-path property").
>
> The former commit only changes a parameter from 0 to NULL I assume it
> doesn't solve the build breakage mentioned as reason for the revert, so
> I kept the reversion.

That sounds correct, thanks.

greg k-h


\
 
 \ /
  Last update: 2013-10-09 09:21    [W:0.066 / U:0.724 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site