DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:sender:in-reply-to:references:date
         :x-google-sender-auth:message-id:subject:from:to:cc:content-type
         :content-transfer-encoding;
        b=BejgenjbUafxUScf+9YWNbqLFbHd7tQysmjb0eRw7+QScTAOPxL/Ooq2KqirL+5Tiw
         fqIqLre9Y7gPSbku+8Wjv87AiaBgjhhvghQPKkPqvqNUxIp0/V4k5B1zwtSKxonU2bfc
         B9kYUfWqXp0OCOE+OVTWkmranN0fhsepDha74=
MIME-Version: 1.0
In-Reply-To: <4B0FB6CA.1030509@snapgear.com>
References: <20091126115806.c53684f5.sfr@canb.auug.org.au>
	 <10f740e80911261329s35f62au37e6b209c657e09@mail.gmail.com>
	 <4B0F5908.3090900@snapgear.com>
	 <10f740e80911270043h567f6bf3l9fc51cfe5a6ac0af@mail.gmail.com>
	 <4B0FB6CA.1030509@snapgear.com>
Date: Fri, 27 Nov 2009 22:21:12 +0100
Message-ID: <10f740e80911271321t305e6439kc49707ac47d41a63@mail.gmail.com>
Subject: Re: linux-next: manual merge of the m68knommu tree with the m68k tree
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Greg Ungerer <gerg@snapgear.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, Andreas Schwab <schwab@linux-m68k.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2175
Lines: 61

On Fri, Nov 27, 2009 at 12:23, Greg Ungerer <gerg@snapgear.com> wrote:
> On 11/27/2009 06:43 PM, Geert Uytterhoeven wrote:
>> On Fri, Nov 27, 2009 at 05:43, Greg Ungerer<gerg@snapgear.com>  wrote:
>>> Geert Uytterhoeven wrote:
>>>> On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell<sfr@canb.auug.org.au>
>>>> 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.

Done.

I also added the #ifdef CONFIG_MMU to Andreas' commit, so it will stay
bisectable on m68knommu.

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
--
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/