Re: linux-next: manual merge of the akpm with Linus' tree
From: Américo Wang <hidden>
Date: 2011-08-30 15:24:35
Also in:
lkml
On Mon, Aug 29, 2011 at 1:22 PM, Stephen Rothwell [off-list ref] 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!