Subject: linux-next: manual merge of the m68knommu tree with the m68k tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 26 Nov 2009 11:58:06 +1100

Hi Greg,

Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/include/asm/ptrace.h between commit
63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
ptrace requests") from the m68k tree and commit
03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
arch_has_single_step() and friends") from the m68knommu tree.

These mostly add the same stuff but not quite :-(

I have done a fixup (see below) and can carry it as necessary.  Please
check the result.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/m68k/include/asm/ptrace.h
index eef9309,beb2091..0000000
--- a/arch/m68k/include/asm/ptrace.h
+++ b/arch/m68k/include/asm/ptrace.h
@@@ -86,14 -84,15 +86,18 @@@ struct switch_stack 
  extern void show_regs(struct pt_regs *);
  
  /*
 - * These are defined as per linux/ptrace.h.
 + * These are defined as per linux/ptrace.h, which see.
   */
+ struct task_struct;
+ 
 -#ifndef CONFIG_MMU
 -#define	arch_has_single_step()	(1)
 +#define arch_has_single_step()	(1)
  extern void user_enable_single_step(struct task_struct *);
  extern void user_disable_single_step(struct task_struct *);
 +
++#ifdef CONFIG_MMU
 +#define arch_has_block_step()	(1)
 +extern void user_enable_block_step(struct task_struct *);
+ #endif
  
  #endif /* __KERNEL__ */
  #endif /* __ASSEMBLY__ */