From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756269AbaAWI1f (ORCPT ); Thu, 23 Jan 2014 03:27:35 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49500 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333AbaAWI1e (ORCPT ); Thu, 23 Jan 2014 03:27:34 -0500 Date: Thu, 23 Jan 2014 09:27:33 +0100 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: Mark Brown , Linux Kernel Mailing List , Liam Girdwood Subject: Re: [GIT PULL] regulator updates for v3.13-rc1 In-Reply-To: References: <20131125174037.GR14725@sirena.org.uk> <20131126003919.GT14725@sirena.org.uk> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 21 Jan 2014 11:16:57 -0800, Linus Torvalds wrote: > > On Mon, Nov 25, 2013 at 4:39 PM, Mark Brown wrote: > > > > If you're OK with octopus merges for things like this I'll definitely > > take another look at using them, the enormous stack of merge commits > > always looks noisy to me in the logs and pull requests and for things > > like driver updates there's unlikely to be much doubt about which branch > > it was if there's a problem. > > Christ. When you start doing octopus merges, you don't do it by half > measures, do you? > > I just pulled the sound updates from Takashi, and as a result got your > merge commit 2cde51fbd0f3. That one has 66 parents. > > That kind of merge either needs to be split up, or gitk needs to be > made better about visualizing it, because it ends up being *so* wide > that the history is hard to read. Yep, sorry, it's my fault that I overlooked Medusa there. I usually check with gitk, but at this time, I checked the results only via --no-merges option for concentrating on the real changes. Now I looked at it, and I was turned into sto..n...e...... Takashi > I think you'll find that having that many parents also breaks old > versions of git. > > Anyway, I'd suggest you try to limit octopus merges to ~15 parents or > less to make the visualization tools not go crazy. Maybe aim for just > 10 or so in most cases. > > It's pulled, and it's fine, but there's clearly a balance between > "octopus merges are fine" and "Christ, that's not an octopus, that's a > Cthulhu merge". > > Linus > -- > 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/ >