From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree Date: Thu, 26 Nov 2009 22:29:22 +0100 Message-ID: <10f740e80911261329s35f62au37e6b209c657e09@mail.gmail.com> References: <20091126115806.c53684f5.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-ew0-f219.google.com ([209.85.219.219]:58058 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbZKZV3S convert rfc822-to-8bit (ORCPT ); Thu, 26 Nov 2009 16:29:18 -0500 In-Reply-To: <20091126115806.c53684f5.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Greg Ungerer , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Schwab On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell = wrote: > 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 :-( Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my" includes ;-) So we need better coordination between us. IIRC, Greg's changes were inspired by Andreas' patch. > I have done a fixup (see below) and can carry it as necessary. =C2=A0= Please > check the result. At first sight, it looks OK. Thanks for fixing it up! > -- > Cheers, > Stephen Rothwell =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0sfr@canb.auug.org.au > > 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 > =C2=A0extern void show_regs(struct pt_regs *); > > =C2=A0/* > =C2=A0- * These are defined as per linux/ptrace.h. > =C2=A0+ * These are defined as per linux/ptrace.h, which see. > =C2=A0 */ > + struct task_struct; > + > =C2=A0-#ifndef CONFIG_MMU > =C2=A0-#define =C2=A0 =C2=A0 =C2=A0 arch_has_single_step() =C2=A0(1) > =C2=A0+#define arch_has_single_step() =C2=A0 =C2=A0 =C2=A0 =C2=A0(1) > =C2=A0extern void user_enable_single_step(struct task_struct *); > =C2=A0extern void user_disable_single_step(struct task_struct *); > =C2=A0+ > ++#ifdef CONFIG_MMU > =C2=A0+#define arch_has_block_step() (1) > =C2=A0+extern void user_enable_block_step(struct task_struct *); > + #endif > > =C2=A0#endif /* __KERNEL__ */ > =C2=A0#endif /* __ASSEMBLY__ */ Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-= m68k.org In personal conversations with technical people, I call myself a hacker= =2E But when I'm talking to journalists I just say "programmer" or something li= ke that. -- Linus Torvalds