The patch titled uml: kill x86_64 STACK_TOP_MAX has been added to the -mm tree. Its filename is uml-kill-x86_64-stack_top_max.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: kill x86_64 STACK_TOP_MAX From: Jeff Dike <jdike@xxxxxxxxxxx> The x86_64 a.out.h got a definition of STACK_TOP_MAX, which interferes with the UML version. So, just undef it like STACK_TOP. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-um/a.out.h | 1 + 1 files changed, 1 insertion(+) diff -puN include/asm-um/a.out.h~uml-kill-x86_64-stack_top_max include/asm-um/a.out.h --- a/include/asm-um/a.out.h~uml-kill-x86_64-stack_top_max +++ a/include/asm-um/a.out.h @@ -5,6 +5,7 @@ #include "choose-mode.h" #undef STACK_TOP +#undef STACK_TOP_MAX extern unsigned long stacksizelim; _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are origin.patch uml-remove-page_size-from-libc-code.patch uml-kill-x86_64-stack_top_max.patch hostfs-convert-to-new-aops.patch uml-fix-request-sector-update.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html