Re: linux-next: manual merge of the generic-ipi tree

[Ingo Molnar <mingo@elte.hu>]

* Ingo Molnar <mingo@elte.hu> wrote:

> > > i hope i'll be able to update the auto-*-next branches soon - a 
> > > lot of them got very empty ;-)
> > 
> > As I am hoping ...
> 
> hm, so them being stale over the merge window is a problem for you, 
> even thought the sha1's didnt change? Ok - i'll do a full integration 
> run right away to update them all to linus-very-latest. There's been 
> quite a number of nontrivial interactions.

ok, i've done the integration run of all of tip's auto-*-next branches 
and pushed out the result.

note, you might run into a conflict in arch/x86/kernel/Makefile, the 
correct final resolution is:

 ifdef CONFIG_FTRACE
 # Do not profile debug and lowlevel utilities
 CFLAGS_REMOVE_tsc.o = -pg
 CFLAGS_REMOVE_rtc.o = -pg
 CFLAGS_REMOVE_paravirt.o = -pg
 endif

	Ingo