Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754504AbZK0LdM (ORCPT ); Fri, 27 Nov 2009 06:33:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754487AbZK0LdL (ORCPT ); Fri, 27 Nov 2009 06:33:11 -0500 Received: from outbound-mail02.westnet.com.au ([203.10.1.243]:60947 "EHLO outbound-mail02.westnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754484AbZK0LdK (ORCPT ); Fri, 27 Nov 2009 06:33:10 -0500 X-Greylist: delayed 558 seconds by postgrey-1.27 at vger.kernel.org; Fri, 27 Nov 2009 06:33:09 EST X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: An8CANpFD0t8lZCG/2dsb2JhbAAIhD+UTqtckDcCgS2CLlQE X-IronPort-AV: E=Sophos;i="4.47,300,1257091200"; d="scan'208";a="46511455" Message-ID: <4B0FB6CA.1030509@snapgear.com> Date: Fri, 27 Nov 2009 21:23:54 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 MIME-Version: 1.0 To: Geert Uytterhoeven CC: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Schwab Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree References: <20091126115806.c53684f5.sfr@canb.auug.org.au> <10f740e80911261329s35f62au37e6b209c657e09@mail.gmail.com> <4B0F5908.3090900@snapgear.com> <10f740e80911270043h567f6bf3l9fc51cfe5a6ac0af@mail.gmail.com> In-Reply-To: <10f740e80911270043h567f6bf3l9fc51cfe5a6ac0af@mail.gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3394 Lines: 102 Hi Geert, On 11/27/2009 06:43 PM, Geert Uytterhoeven wrote: > On Fri, Nov 27, 2009 at 05:43, Greg Ungerer wrote: >> Geert Uytterhoeven wrote: >>> >>> 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. >> >> Yes, largely they are. >> >> >>>> I have done a fixup (see below) and can carry it as necessary. Please >>>> check the result. >>> >>> At first sight, it looks OK. Thanks for fixing it up! >> >> Yep, looks ok from what I can see. >> >> Geert, how do you want to handle for the real linus merge? >> Do you want me to drop the changes to ptrace.h from that patch? > > I can apply your patch (modified to apply on top of Andreas') to the > m68k for-linus branch. > Does that sound OK for you? Yep, thats fine by me. Regards Greg >>>> -- >>>> Cheers, >>>> Stephen Rothwell sfr@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 >>>> 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__ */ > > 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. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > -- ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close, FAX: +61 7 3891 3630 Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/