lkml.org 
[lkml]   [2011]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the akpm with Linus' tree
From
On Mon, Aug 29, 2011 at 1:22 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got a conflict in
> arch/cris/include/asm/serial.h between commit 02016bc0381c ("cris: add
> arch/cris/include/asm/serial.h") from Linus' tree and commit f8b20ed71f1b
> ("Fix the following build errors:") from the akpm tree.
>
> There former appears to be a later version of the latter, so I dropped
> the latter.

Yeah, thanks Stephen!


\
 
 \ /
  Last update: 2011-08-30 17:27    [W:0.033 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site