Hi Ingo, [Its midnight, so this is just a quick reply.] On Wed, 1 Apr 2009 14:51:48 +0200 Ingo Molnar <mingo@xxxxxxx> wrote: > > * Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > This patch is now applicable to the tracing tree after merging > > with Linus' tree. > > Thanks, that's useful info. > > There's the skb tracepoints related merge fixlet needed too. > Anything else in this context you are aware of? They are the only two build fixes I have at the moment. On top of that these are the only conflicts I get when merging the tip trees: Merging tip-core/auto-core-next CONFLICT (content): Merge conflict in include/linux/netfilter/xt_limit.h CONFLICT (content): Merge conflict in include/linux/netfilter/xt_statistic.h CONFLICT (content): Merge conflict in lib/Kconfig.debug Merging cpus4096/auto-cpus4096-next CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel_cacheinfo.c CONFLICT (content): Merge conflict in drivers/oprofile/buffer_sync.c Merging tracing/auto-tracing-next CONFLICT (add/add): Merge conflict in arch/parisc/include/asm/ftrace.h CONFLICT (content): Merge conflict in include/linux/slub_def.h CONFLICT (content): Merge conflict in kernel/extable.c CONFLICT (content): Merge conflict in mm/slob.c CONFLICT (content): Merge conflict in mm/slub.c I think these are mostly trivial (except the parisc one you commented on before). Some are caused by the same commit being in two trees and further work in one of them. Anything non-tivial will have been reported previously. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpbpYhbZxkQe.pgp
Description: PGP signature
