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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgppR4Llgy5JJ.pgp
Description: PGP signature
