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

From: Ingo Molnar <[email-masked]>
Date: Tue, 14 Oct 2008 08:26:52 +0200

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

> Hi all,
> 
> Today's linux-next merge of the ftrace tree got a conflict in 
> arch/x86/kernel/traps.c between various commits now in Linus' tree and 
> various commits from the ftrace tree.
> 
> The result is a bit of a mess and really needs to be resolved by 
> someone who understands the changes involved.  So I have dropped the 
> ftrace tree for today.

yes - it's quite complex to merge it in its current state, i'll resolve 
that and reintegrate.

	Ingo