The patch titled Subject: mn10300: remove duplicate definition of PTRACE_O_TRACESYSGOOD has been added to the -mm tree. Its filename is mn10300-remove-duplicate-definition-of-ptrace_o_tracesysgood.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: mn10300: remove duplicate definition of PTRACE_O_TRACESYSGOOD include/linux/ptrace.h:66:0: warning: "PTRACE_O_TRACESYSGOOD" redefined [enabled by default] arch/mn10300/include/asm/ptrace.h:85:0: note: this is the location of the previous definition We already have it in <linux/ptrace.h>, so remove it from <asm/ptrace.h> Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Koichi Yasutake <yasutake.koichi@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/mn10300/include/asm/ptrace.h | 3 --- 1 file changed, 3 deletions(-) diff -puN arch/mn10300/include/asm/ptrace.h~mn10300-remove-duplicate-definition-of-ptrace_o_tracesysgood arch/mn10300/include/asm/ptrace.h --- a/arch/mn10300/include/asm/ptrace.h~mn10300-remove-duplicate-definition-of-ptrace_o_tracesysgood +++ a/arch/mn10300/include/asm/ptrace.h @@ -81,9 +81,6 @@ struct pt_regs { #define PTRACE_GETFPREGS 14 #define PTRACE_SETFPREGS 15 -/* options set using PTRACE_SETOPTIONS */ -#define PTRACE_O_TRACESYSGOOD 0x00000001 - #ifdef __KERNEL__ #define user_mode(regs) (((regs)->epsw & EPSW_nSL) == EPSW_nSL) _ Subject: Subject: mn10300: remove duplicate definition of PTRACE_O_TRACESYSGOOD Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch linux-next.patch xtensa-replace-xtensa-specific-_fdatatext-by-_sdatatext.patch xtensa-use-test-e-instead-of-bashism-test-a.patch xtensa-use-the-declarations-provided-by-asm-sectionsh.patch h8300-fix-use-of-extinct-_sbss-and-_ebss.patch h8300-use-the-declarations-provided-by-asm-sectionsh.patch mn10300-move-setup_jiffies_interrupt-to-cevt-mn10300c.patch mn10300-remove-duplicate-definition-of-ptrace_o_tracesysgood.patch mn10300-kernel-internalh-needs-linux-irqreturnh.patch mn10300-kernel-trapsc-needs-linux-exporth.patch mn10300-mm-dma-allocc-needs-linux-exporth.patch mn10300-use-elif-definedconfig_-instead-of-elif-config_.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