Re: linux-next: manual merge of the akpm with Linus' tree

[AmÃrico Wang]

On Mon, Aug 29, 2011 at 1:22 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/