Messages in this thread | | | Date | Sat, 19 Feb 2011 09:39:30 +0100 | Subject | Re: merge of m68knommu and m68k arch branches? | From | Geert Uytterhoeven <> |
| |
On Fri, Feb 18, 2011 at 23:12, Greg Ungerer <gerg@snapgear.com> wrote: > On 19/02/11 01:24, Geert Uytterhoeven wrote: >> On Fri, Feb 18, 2011 at 12:27, Geert Uytterhoeven<geert@linux-m68k.org> >> wrote: >>> >>> 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. >>> >>> Building... >> >> Builds fine (all test configs), runs on ARAnyM. >> >> Let's go ahead? > > What sort of timing do you think makes sense? > Is for 2.6.39 too soon?
Personally, I don't mind. 2.6.39 is OK for me. I guess the safest way is to let Linus execute the script? Before or after the merge window?
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 -- 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/
| |