lkml.org 
[lkml]   [2010]   [Jul]   [27]   [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 genesis tree
On Tue, Jul 27, 2010 at 02:34:30PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> include/linux/serial_core.h between commit
> 75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
> found on some sh-mobile SoCs") from the genesis tree and commit
> c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
> Speed UART device") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix looks fine.

greg k-h


\
 
 \ /
  Last update: 2010-07-27 06:49    [W:0.026 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site