The patch titled Subject: sgi-xp-handle-non-fatal-traps-fix has been removed from the -mm tree. Its filename was sgi-xp-handle-non-fatal-traps-fix.patch This patch was dropped because it was folded into sgi-xp-handle-non-fatal-traps.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: sgi-xp-handle-non-fatal-traps-fix Cc: <stable@xxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Robin Holt <holt@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-xp/xpc_main.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/misc/sgi-xp/xpc_main.c~sgi-xp-handle-non-fatal-traps-fix drivers/misc/sgi-xp/xpc_main.c --- a/drivers/misc/sgi-xp/xpc_main.c~sgi-xp-handle-non-fatal-traps-fix +++ a/drivers/misc/sgi-xp/xpc_main.c @@ -53,7 +53,9 @@ #include <linux/kthread.h> #include "xpc.h" +#ifdef CONFIG_X86_64 #include <asm/traps.h> +#endif /* define two XPC debug device structures to be used with dev_dbg() et al */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch compaction-fix-build-error-in-cma-compaction.patch drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid.patch drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists.patch hfsplus-rework-processing-of-hfs_btree_write-returned-error.patch revert-rtc-recycle-id-when-unloading-a-rtc-driver.patch sgi-xp-handle-non-fatal-traps.patch sendfile-allows-bypassing-of-notifier-events.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