Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758599Ab1BRWOQ (ORCPT ); Fri, 18 Feb 2011 17:14:16 -0500 Received: from sncsmrelay2.nai.com ([67.97.80.206]:60689 "EHLO sncsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753870Ab1BRWOP (ORCPT ); Fri, 18 Feb 2011 17:14:15 -0500 Message-ID: <4D5EEEBB.7050708@snapgear.com> Date: Sat, 19 Feb 2011 08:12:11 +1000 From: Greg Ungerer User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 MIME-Version: 1.0 To: Geert Uytterhoeven CC: Linux/m68k , Linux Kernel Development , Steven King , uClinux development list , Greg Ungerer , Greg Ungerer Subject: Re: merge of m68knommu and m68k arch branches? References: <4D5DB83D.80205@snapgear.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 18 Feb 2011 22:13:01.0806 (UTC) FILETIME=[01E7D0E0:01CBCFB9] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1658 Lines: 40 Hi Geert, 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? Regards Greg ------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com SnapGear Group, McAfee PHONE: +61 7 3435 2888 8 Gardner Close FAX: +61 7 3217 5323 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/