Subject: Re: linux-next: manual merge of the kmemcheck tree

From: Ingo Molnar <[email-masked]>
Date: Tue, 22 Jul 2008 08:52:11 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> Today's linux-next merge of the kmemcheck tree got a trivial conflict in
> arch/x86/kernel/traps_32.c between commit
> 6ac8d51f01d345af5ea4209004a9ea29b2f20891 ("x86: introducing
> asm-x86/traps.h") from Linus' tree and commit
> 787ecfaa503dc63ff1831ddc74b15dad49bace1d ("x86: add hooks for kmemcheck")
> from the kmemcheck tree.
> 
> Just overlapping additions of includes.  I can carry it.

thanks Stephen - i had this conflict fixup too in tip/master but not yet 
in auto-kmemcheck-next. I've now propagated it so the conflict should go 
away on your next integration run.

	Ingo