Hi Srikar, After merging the uprobes tree, today's linux-next build (x86_64 allmodconfig) failed like this: In file included from include/linux/compat.h:18:0, from arch/x86/include/asm/ia32.h:7, from arch/x86/include/asm/sigframe.h:17, from arch/x86/kernel/asm-offsets.c:16: arch/x86/include/asm/compat.h:238:20: error: redefinition of 'is_ia32_task' arch/x86/include/asm/thread_info.h:272:20: note: previous definition of 'is_ia32_task' was here Caused by commit 081c056eccf3 ("x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h") which added the function to asm/thread_info.h but did not remove it from asm/compat.h. The version of this patch that is in the tip tree is correct (but that is not in tip's auto-latest branch (and hence linux-next) today). I would have used the uprobes tree from next-20130309, but trying that produced a large number of conflicts, so I just dropped the uprobes tree for today. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpx93ocjrwf4.pgp
Description: PGP signature