The patch titled Subject: linux/audit.h: move ptrace.h include to kernel header has been removed from the -mm tree. Its filename was linux-audith-move-ptraceh-include-to-kernel-header.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Mike Frysinger <vapier@xxxxxxxxxx> Subject: linux/audit.h: move ptrace.h include to kernel header While the kernel internals want pt_regs (and so it includes linux/ptrace.h), the user version of audit.h does not need it. So move the include out of the uapi version. This avoids issues where people want the audit defines and userland ptrace api. Including both the kernel ptrace and the userland ptrace headers can easily lead to failure. Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/audit.h | 1 + include/uapi/linux/audit.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/audit.h~linux-audith-move-ptraceh-include-to-kernel-header include/linux/audit.h --- a/include/linux/audit.h~linux-audith-move-ptraceh-include-to-kernel-header +++ a/include/linux/audit.h @@ -24,6 +24,7 @@ #define _LINUX_AUDIT_H_ #include <linux/sched.h> +#include <linux/ptrace.h> #include <uapi/linux/audit.h> struct audit_sig_info { diff -puN include/uapi/linux/audit.h~linux-audith-move-ptraceh-include-to-kernel-header include/uapi/linux/audit.h --- a/include/uapi/linux/audit.h~linux-audith-move-ptraceh-include-to-kernel-header +++ a/include/uapi/linux/audit.h @@ -26,7 +26,6 @@ #include <linux/types.h> #include <linux/elf-em.h> -#include <linux/ptrace.h> /* The netlink messages for the audit system is divided into blocks: * 1000 - 1099 are for commanding the audit system _ Patches currently in -mm which might be from vapier@xxxxxxxxxx are origin.patch linux-next.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