[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110221215719.GA24535@merkur.ravnborg.org>
Date: Mon, 21 Feb 2011 22:57:19 +0100
From: Sam Ravnborg <sam@...nborg.org>
To: Arnd Bergmann <arnd@...db.de>
Cc: Greg Ungerer <gerg@...pgear.com>,
Linux/m68k <linux-m68k@...r.kernel.org>,
Linux Kernel Development <linux-kernel@...r.kernel.org>,
Steven King <sfking00@...oo.com>,
uClinux development list <uclinux-dev@...inux.org>,
Greg Ungerer <gerg@...inux.org>,
Greg Ungerer <gregungerer@...tnet.com.au>
Subject: Re: merge of m68knommu and m68k arch branches?
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
> > >> <sfking@...dc.com> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists