Hi Ingo,

On Tue, 27 May 2008 09:43:10 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> this is not an 'ftrace build bug', this is an integration artifact of 

I didn't say it was a bug.  My subject line (and I have been writing them
like this since I started linux-next in February) means "The build failed
after I merged the ftrace tree".  Nothing more, nothing less.

> -next. It is fixed in -tip too (which too integrates these topics) in a 
> different branch.

And I said it was a merge artifact.

> it's in a different branch because this is a change only makes sense if 
> the 'tip/core/rcu' and 'tip/auto-ftrace-next' topics are combined - 
> hence it lives in the "tip/auto-test-fixes" (commit 48bd24be18) - and 
> this change was always there as the combined result wouldnt even build 
> without this fix.

Good and correct.

> So this is a true "merge only commit" that cannot live standalone in any 
> of the topic branches it is related to.

Right.  And I am happy to carry the patch if you want me to.
Alternatively, since auto-ftrace-next is really only meant for merging
into linux-next, you could merge core/rcu (in addition to the curent
merge into auto-sched-next) and the fixup into there.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/