[lkml]   [2013]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the char-misc tree with the tty tree
On Thu, Jan 17, 2013 at 01:54:20PM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/ipack/devices/ipoctal.c between commit 2e124b4a390c ("TTY: switch
> tty_flip_buffer_push") from the tty tree and commits 7e5730d7c222
> ("ipack/devices/ipoctal: fix kernel bug when using pppd"),
> e7e664fd688a ("ipack/devices/ipoctal: protect the channel data processing
> with a spinlock") and b06073f963b7 ("ipack/devices/ipoctal: remove
> redundant tty_flip_buffer_push()") from the char-misc tree.
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me.


[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-01-17 11:21    [W:0.039 / U:1.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site