From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 10 Jan 2006 21:50:53 +0000 (GMT) Received: from alg138.algor.co.uk ([62.254.210.138]:23245 "EHLO bacchus.net.dhis.org") by ftp.linux-mips.org with ESMTP id S8133460AbWAJVuc (ORCPT ); Tue, 10 Jan 2006 21:50:32 +0000 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.net.dhis.org (8.13.4/8.13.4) with ESMTP id k0ALrOhe029027; Tue, 10 Jan 2006 21:53:25 GMT Received: (from ralf@localhost) by denk.linux-mips.net (8.13.4/8.13.4/Submit) id k0ALrMXn029026; Tue, 10 Jan 2006 21:53:22 GMT Date: Tue, 10 Jan 2006 21:53:22 +0000 From: Ralf Baechle To: "P. Christeas" Cc: linux-mips@linux-mips.org, Ivan Korzakow Subject: Re: why the early_initcall(au1x00_setup) do not work? Message-ID: <20060110215322.GA27577@linux-mips.org> References: <50c9a2250601082159p238cacd6r930709da9305479e@mail.gmail.com> <200601101757.45297.p_christ@hol.gr> <200601101857.26978.p_christ@hol.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200601101857.26978.p_christ@hol.gr> User-Agent: Mutt/1.4.2.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 9850 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Tue, Jan 10, 2006 at 06:57:24PM +0200, P. Christeas wrote: > > > You make sure you have the two trees and diff them. > > > They 're both in git and typically you could do that only using git. > > > > Have you ever tried what you're talking about or is it a guess ? > > For example, let's say that there's a bug introduced when merging > > Linus tree with mips branch. How do you easily "bisect" in order to do > > a binary seek of this bug ? > > I was about to mention the git incompatibility as I gave you the first > answer. It's true what you say and I also find it annoying. That's why I use > Linus tree. > I cannot, though, complaint to Ralph about this practice. It seems that he has > done his best to preserve the CVS history of his tree. We can only thank him > for that. It is just a lot of work to trim the tree and make it > Linus-parallel. > There is also things that I don't know about git, so I won't jump to > conclusions yet (as to whether it is feasible to merge with Linus). It is possible to keep both Linus's and the lmo tree in the same repository with a _little_ care. I do that all the time. When compressed this will result in a bloat of just about 10-20MB. Ralf