From: Takashi Iwai Subject: Re: ASoC updates for v3.8 Date: Thu, 29 Nov 2012 18:16:46 +0100 Message-ID: References: <20121129161015.GL32691@opensource.wolfsonmicro.com> <20121129164422.GM32691@opensource.wolfsonmicro.com> <20121129171004.GO32691@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 26C782650D3 for ; Thu, 29 Nov 2012 18:16:47 +0100 (CET) In-Reply-To: <20121129171004.GO32691@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: alsa-devel@alsa-project.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org At Thu, 29 Nov 2012 17:10:04 +0000, Mark Brown wrote: > > On Thu, Nov 29, 2012 at 06:05:57PM +0100, Takashi Iwai wrote: > > > As said, octopus merge of a few branches is fine. It's been done > > occasionally indeed. > > But your latest challenge broke the world record in more than double > > scores. Did you see your tree on gitk? Linus explained that he > > usually takes a look at gitk after merge, so he'll be certainly > > amused, too. > > Well, that's just a gitk UI problem. All GUI programs show in that way, as far as I know. > It's an accurate reflection of > what's happening. Yes, and this reveals something ugly really happened. Using gitk (or any other GUI) is a very fundamental workflow for normal developers. We mustn't mess it up. > > > I don't really have time to go through and generate a bunch of > > > individual merges right now, perhaps tomorrow. > > > OK, thanks. > > Note that there's no guarantee it'll be tomorrow, it may be Sunday. Alright. thanks, Takashi