The patch titled ipmi: make comment match actual preprocessor check has been added to the -mm tree. Its filename is ipmi-make-comment-match-actual-preprocessor-check.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ipmi: make comment match actual preprocessor check From: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/ipmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/ipmi.h~ipmi-make-comment-match-actual-preprocessor-check include/linux/ipmi.h --- a/include/linux/ipmi.h~ipmi-make-comment-match-actual-preprocessor-check +++ a/include/linux/ipmi.h @@ -64,7 +64,7 @@ * applications and another for userland applications. The * capabilities are basically the same for both interface, although * the interfaces are somewhat different. The stuff in the - * #ifdef KERNEL below is the in-kernel interface. The userland + * #ifdef __KERNEL__ below is the in-kernel interface. The userland * interface is defined later in the file. */ _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are origin.patch git-mtd.patch git-nfsd.patch xtensa-warn-about-including-asm-rwsemh-directly.patch xtensa-use-newer-__spin_lock_unlocked-macro.patch kernel-explicitly-include-required-header-files-under-kernel.patch remove-superfluous-include-of-stringh-from-percpuh.patch kbuild-remove-duplicate-conflicting-entry-for-oomh.patch kbuild-move-files-that-dont-check-__kernel__.patch lists-add-const-qualifier-to-first-arg-of-list_splice-operations.patch lists-add-const-qualifier-to-first-arg-of-list_splice-operations-checkpatch-fixes.patch maintainers-clarify-status-of-mn10300-mailing-list-as-moderated.patch mfd-use-shorter-set_current_state.patch isdn-fix-obvious-cut-and-paste-error-in-st5481_usbc.patch ipmi-make-comment-match-actual-preprocessor-check.patch keys-explicitly-include-required-slabh-header-file.patch nbd-delete-superfluous-test-for-__gnuc__.patch generalize-asm-generic-ioctlh-to-allow-overriding-values.patch edac-use-the-shorter-list_head-for-brevity.patch afs-use-the-shorter-list_head-for-brevity.patch sysv-fs-remove-superfluous-check-for-__gnuc__-compiler.patch remove-ifdef-__kernel__-checks-from-unexported-headers.patch remove-__kernel__-tests-of-unexported-headers-under-asm-generic.patch drop-the-exporting-of-empty-linux-byteorder-generich.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