Re: merge of m68knommu and m68k arch branches?

Geert Uytterhoeven
2011-02-18T11:27:43Z

On Fri, Feb 18, 2011 at 01:07, Greg Ungerer <gerg@snapgear.com> 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
> <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.

Initial feedback:

--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -1,5 +1,5 @@
ifdef CONFIG_MMU
-include arch/m68k/Makefile_mm
+include $(srctree)/arch/m68k/Makefile_mm
else
-include arch/m68k/Makefile_no
+include $(srctree)/arch/m68k/Makefile_no
endif

Don't you need to add "# CONFIG_MMU is not set" to all m68knommu
defconfig files?

Building...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds