lkml.org 
[lkml]   [2012]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tty tree with the arm tree
On Tue, Nov 06, 2012 at 02:53:32PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/omap-serial.c between commit d864c03bfce2 ("SERIAL:
> omap: remove setting of EFR SCD bit") from the arm tree and commit
> 7ba897d77ce2 ("serial: omap: Remove the default setting of special
> character") from the tty tree.
>
> I fixed it up (using the version from the arm tree) and can carry the fix
> as necessary (no action is required).

That sounds fine, thanks.

greg k-h


\
 
 \ /
  Last update: 2012-11-06 10:04    [W:0.035 / U:0.192 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site