Re: merge of m68knommu and m68k arch branches?

Arnd Bergmann
2011-02-21T21:43:21Z

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@fdwdc.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...

Arnd