From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: linux-next: manual merge of the sound tree Date: Mon, 01 Sep 2008 10:34:32 +0200 Message-ID: References: <20080901142030.513d82eb.sfr@canb.auug.org.au> <20080831.213607.09599119.davem@davemloft.net> <20080901.012827.193698949.davem@davemloft.net> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: Received: from ns1.suse.de ([195.135.220.2]:38156 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752046AbYIAIed (ORCPT ); Mon, 1 Sep 2008 04:34:33 -0400 In-Reply-To: <20080901.012827.193698949.davem@davemloft.net> Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org At Mon, 01 Sep 2008 01:28:27 -0700 (PDT), David Miller wrote: > > > Where can I find this change? I now looked at > > git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git > > but it has no such a commit > > sparc-next-2.6.git is where "-next" changes for Sparc live :) Ah, that obvious one. Thanks. > > I can either remove the affecting chunk in my patch, or merge your > > patch first to my tree and rebase. > > The other option is for Stephen to just keep fixing the merge, > if we just do nothing his way of doing this is automated. That's fine for me, too. But, I guess we'd need to fix the conflict anyway when 2.6.28 merge window is opened. Takashi