The patch titled x86: remove duplicate declaration of unknown_nmi_panic has been added to the -mm tree. Its filename is x86-remove-duplicate-declaration-of-unknown_nmi_panic.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: x86: remove duplicate declaration of unknown_nmi_panic From: Fernando Luis Vazquez Cao <fernando@xxxxxxxxxxxxx> Signed-off-by: Fernando Luis Vazquez Cao <fernando@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-x86/nmi.h | 1 - 1 file changed, 1 deletion(-) diff -puN include/asm-x86/nmi.h~x86-remove-duplicate-declaration-of-unknown_nmi_panic include/asm-x86/nmi.h --- a/include/asm-x86/nmi.h~x86-remove-duplicate-declaration-of-unknown_nmi_panic +++ a/include/asm-x86/nmi.h @@ -46,7 +46,6 @@ extern void nmi_watchdog_default(void); extern int check_nmi_watchdog(void); extern int nmi_watchdog_enabled; -extern int unknown_nmi_panic; extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); extern int avail_to_resrv_perfctr_nmi(unsigned int); extern int reserve_perfctr_nmi(unsigned int); _ Patches currently in -mm which might be from fernando@xxxxxxxxxxxxx are x86-remove-duplicate-declaration-of-unknown_nmi_panic.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