[lkml]   [2013]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the tty tree with the tty.current tree
On Thu, Jan 17, 2013 at 01:07:38PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250/8250_dw.c between commit 68e56cb3a068 ("tty:
> 8250_dw: Fix inverted arguments to serial_out in IRQ handler") from the
> tty.current tree and commit 30046df26187 ("serial: 8250_dw: Set FIFO size
> dynamically") from the tty tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks.

greg k-h

 \ /
  Last update: 2013-01-18 03:01    [W:0.041 / U:0.896 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site