The patch titled
arch/powerpc: remove duplicate includes
has been removed from the -mm tree. Its filename was
arch-powerpc-remove-duplicate-includes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: arch/powerpc: remove duplicate includes
From: Lucas Woods <[EMAIL PROTECTED]>
Signed-off-by: Lucas Woods <[EMAIL PROTECTED]>
Cc: Paul Mackerras <[EMAIL PROTECTED]>
Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/powerpc/kernel/signal_32.c | 3 +--
arch/powerpc/platforms/powermac/setup.c | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff -puN
arch/powerpc/kernel/signal_32.c~arch-powerpc-remove-duplicate-includes
arch/powerpc/kernel/signal_32.c
--- a/arch/powerpc/kernel/signal_32.c~arch-powerpc-remove-duplicate-includes
+++ a/arch/powerpc/kernel/signal_32.c
@@ -24,13 +24,12 @@
#include <linux/signal.h>
#include <linux/errno.h>
#include <linux/elf.h>
+#include <linux/ptrace.h>
#ifdef CONFIG_PPC64
#include <linux/syscalls.h>
#include <linux/compat.h>
-#include <linux/ptrace.h>
#else
#include <linux/wait.h>
-#include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/tty.h>
diff -puN
arch/powerpc/platforms/powermac/setup.c~arch-powerpc-remove-duplicate-includes
arch/powerpc/platforms/powermac/setup.c
---
a/arch/powerpc/platforms/powermac/setup.c~arch-powerpc-remove-duplicate-includes
+++ a/arch/powerpc/platforms/powermac/setup.c
@@ -94,7 +94,6 @@ extern struct machdep_calls pmac_md;
#define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
#ifdef CONFIG_PPC64
-#include <asm/udbg.h>
int sccdbg;
#endif
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
git-arm.patch
git-powerpc.patch
git-mips.patch
git-x86.patch
git-xtensa.patch
arch-alpha-removed-duplicate-includes.patch
arch-um-remove-duplicate-includes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
