lkml.org 
[lkml]   [2011]   [Nov]   [18]   [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 s5p tree
On Fri, Nov 18, 2011 at 02:22:59PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/Kconfig between commit 30fba06ac9eb ("serial: samsung:
> merge probe() function from all SoC specific extensions") from the s5p tree
> and commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
> drivers") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Looks fine, thanks.

greg k-h


\
 
 \ /
  Last update: 2011-11-18 17:39    [W:0.093 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site