From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: merge of m68knommu and m68k arch branches? Date: Mon, 21 Feb 2011 22:43:15 +0100 Message-ID: <201102212243.15867.arnd@arndb.de> References: <4D5DB83D.80205@snapgear.com> <20110218074401.GA26836@merkur.ravnborg.org> <4D5E5FB1.1000404@snapgear.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de ([212.227.17.9]:65486 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034Ab1BUVnV (ORCPT ); Mon, 21 Feb 2011 16:43:21 -0500 In-Reply-To: <4D5E5FB1.1000404@snapgear.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: Greg Ungerer Cc: Sam Ravnborg , Linux/m68k , Linux Kernel Development , Steven King , uClinux development list , Greg Ungerer , Greg Ungerer 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... Arnd