* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
