The patch titled powerpc prom.c: remove #undef printk has been added to the -mm tree. Its filename is powerpc-promc-remove-undef-printk.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: powerpc prom.c: remove #undef printk From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/prom.c | 2 -- 1 file changed, 2 deletions(-) diff -puN arch/powerpc/kernel/prom.c~powerpc-promc-remove-undef-printk arch/powerpc/kernel/prom.c --- a/arch/powerpc/kernel/prom.c~powerpc-promc-remove-undef-printk +++ a/arch/powerpc/kernel/prom.c @@ -1040,8 +1040,6 @@ void __init early_init_devtree(void *par DBG(" <- early_init_devtree()\n"); } -#undef printk - int of_n_addr_cells(struct device_node* np) { const int *ip; _ Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are origin.patch x86_64-fix-default_do_nmi-missing-return-after-a-if.patch git-avr32.patch powerpc-promc-remove-undef-printk.patch linux-kernel-markers-kconfig-menus.patch linux-kernel-markers-kconfig-menus-update.patch linux-kernel-markers-architecture-independant-code.patch linux-kernel-markers-architecture-independant-code-update.patch allow-userspace-applications-to-use-markerh-to-parse-the-markers-section-in-the-kernel-binary.patch linux-kernel-markers-powerpc-optimization.patch linux-kernel-markers-powerpc-optimization-update.patch linux-kernel-markers-powerpc-optimization-fix.patch linux-kernel-markers-i386-optimization.patch linux-kernel-markers-i386-optimization-update.patch linux-kernel-markers-non-optimized-architectures.patch linux-kernel-markers-non-optimized-architectures-update.patch linux-kernel-markers-documentation.patch linux-kernel-markers-documentation-update.patch markers-define-the-linker-macro-extra_rwdata.patch markers-use-extra_rwdata-in-architectures.patch port-of-blktrace-to-the-linux-kernel-markers.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