Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908Ab1BUV5Y (ORCPT ); Mon, 21 Feb 2011 16:57:24 -0500 Received: from pfepa.post.tele.dk ([195.41.46.235]:37623 "EHLO pfepa.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095Ab1BUV5W (ORCPT ); Mon, 21 Feb 2011 16:57:22 -0500 Date: Mon, 21 Feb 2011 22:57:19 +0100 From: Sam Ravnborg To: Arnd Bergmann Cc: Greg Ungerer , Linux/m68k , Linux Kernel Development , Steven King , uClinux development list , Greg Ungerer , Greg Ungerer Subject: Re: merge of m68knommu and m68k arch branches? Message-ID: <20110221215719.GA24535@merkur.ravnborg.org> References: <4D5DB83D.80205@snapgear.com> <20110218074401.GA26836@merkur.ravnborg.org> <4D5E5FB1.1000404@snapgear.com> <201102212243.15867.arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201102212243.15867.arnd@arndb.de> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1345 Lines: 29 On Mon, Feb 21, 2011 at 10:43:15PM +0100, Arnd Bergmann wrote: > On Friday 18 February 2011 13:01:53 Greg Ungerer wrote: > > >> 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. > > > > > > The initial version of said script was created by Arnd IIRC. > > > > Apologies to Arnd then :-) > > I had absolutely no memory of having done said script, but if Sam > says wrote it did, that's probably true. > > I was just about to say how much I like your script when I read > that it was my idea... See semi original version in: 49148020bcb6910ce71417bd990a5ce7017f9bd3 Sam -- 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/