Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240Ab1BVHOL (ORCPT ); Tue, 22 Feb 2011 02:14:11 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:61569 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752173Ab1BVHOJ convert rfc822-to-8bit (ORCPT ); Tue, 22 Feb 2011 02:14:09 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=PKz2D4ttJcUF/bbZZc515pX1fCgOc7Q3efrq6SaRrYmDzbxhqItEH+1bhqwzcadZZv jXjmVr1jsIfxRMqc7TIYYiGzZbR3KfPaHFHFngFCFq7u87ehU4mPOGc4dqWO8jzgR090 KVk8vFc3wWuZcfxXwkdRci38ySTG/a8Gh+33M= MIME-Version: 1.0 In-Reply-To: <4D6319E0.9080907@snapgear.com> References: <4D5DB83D.80205@snapgear.com> <4D6319E0.9080907@snapgear.com> Date: Tue, 22 Feb 2011 08:14:08 +0100 X-Google-Sender-Auth: K0_rHeBSYim-VVwgdVMx0xOvWcM Message-ID: Subject: Re: merge of m68knommu and m68k arch branches? From: Geert Uytterhoeven To: Greg Ungerer Cc: Thomas Gleixner , "Linux/m68k" , Linux Kernel Development , Steven King , uClinux development list , Greg Ungerer , Greg Ungerer Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1836 Lines: 42 On Tue, Feb 22, 2011 at 03:05, Greg Ungerer wrote: > On 22/02/11 07:18, Thomas Gleixner wrote: >> On Fri, 18 Feb 2011, Greg Ungerer wrote: >>> Inside of the new arch/m68k is a little messy in the kernel and mm >>> directories. There is plenty of scope for cleanup and merge on the >>> files in here - but I want to leave that for follow up patches after >>> this initial directory merge. As a data point, when we merged the >>> m68k and m68knommu include files we had something like 70 or 80 >>> duplicate but separate files, after some cleanups that is now down to >>> 10. Ongoing cleanup will merge some of these remaining ones as well. >>> >>> Thoughts? >> >> Hmm, how are you going to deal with the fact, that m68knommu uses >> genirq, m68k not? I guess there are some more points like this >> (clockevents, clocksource ...) > > Initially it has no impact. This first step pretty much just > combines the 2 directories, it doesn't attempt to do a fine > grained merge of each file. (It does factor out identical > files - quite a few in arch/m68k/lib for example). > > >> Is there a plan to move m68k to the generic facilities as well ? Moving m68k to genirq is (the next thing?) on my list... 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/