Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753889Ab1BUHl1 (ORCPT ); Mon, 21 Feb 2011 02:41:27 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:41095 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751Ab1BUHl0 convert rfc822-to-8bit (ORCPT ); Mon, 21 Feb 2011 02:41:26 -0500 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=pNFeXOwyQRMaJ/uchjwM7F/PZ0/3RqlWLWzcLdQ09s77TSk6IowEgFmVeYOqzMuZKA pZMc0Nka+xQeeRpQDzi8lUVNyUHuwdxKzFLPRLuH5qn4FMIoRi9sGTKakKgM44JkcQsU PgVSx0No7y+6vajrruXz63Sqqdyz+hwfZeOVI= MIME-Version: 1.0 In-Reply-To: <4D61A986.3060308@snapgear.com> References: <4D5DB83D.80205@snapgear.com> <4D5EEEBB.7050708@snapgear.com> <4D61A986.3060308@snapgear.com> Date: Mon, 21 Feb 2011 08:41:24 +0100 X-Google-Sender-Auth: 15faLg7AQI4l1gFHQTWvGReGF4c Message-ID: Subject: Re: merge of m68knommu and m68k arch branches? From: Geert Uytterhoeven To: Greg Ungerer Cc: "Linux/m68k" , Linux Kernel Development , Steven King , uClinux development list , Greg Ungerer , Greg Ungerer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2421 Lines: 63 On Mon, Feb 21, 2011 at 00:53, Greg Ungerer wrote: > On 19/02/11 18:39, Geert Uytterhoeven wrote: >> >> On Fri, Feb 18, 2011 at 23:12, Greg Ungerer  wrote: >>> >>> On 19/02/11 01:24, Geert Uytterhoeven wrote: >>>> >>>> On Fri, Feb 18, 2011 at 12:27, Geert Uytterhoeven >>>>  wrote: >>>>> >>>>> On Fri, Feb 18, 2011 at 01:07, Greg Ungerer >>>>>  wrote: >>>>>> >>>>>> I would like to put up for discussion a merge of the m68knommu and >>>>>> m68k arch branches. >>>>>> >>>>>> Attached is a script and patch that does a kind of brute force >>>>>> simplistic merge of the directories and files. (Thanks to Stephen King >>>>>>    for the initial version of this script, and to >>>>>> Sam Ravnborg for the m68k includes merge script this was based on). >>>>>> Nothing outside of the arch/m68k and arch/m68knommu directories is >>>>>> touched, and in the end there is no more arch/m68knommu. To apply you >>>>>> simply run the script from the top of a current kernel git tree (I >>>>>> used >>>>>> 2.6.38-rc5 for testing) and then apply the patch. >>>>> >>>>> Building... >>>> >>>> Builds fine (all test configs), runs on ARAnyM. >>>> >>>> Let's go ahead? >>> >>> What sort of timing do you think makes sense? >>> Is for 2.6.39 too soon? >> >> Personally, I don't mind. 2.6.39 is OK for me. I guess the safest way >> is to let Linus >> execute the script? Before or after the merge window? > > Well I was going to construct the merge as a single git commit > (which is equivalent to running this script and applying the patch). > Linus would then just pull this. > > The best timing for me is near the end of the merge window. > That way we can both get in any other changes first. Sounds like a plan, OK! 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/