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 11:26:38 +0200 Message-ID: References: <20080901142030.513d82eb.sfr@canb.auug.org.au> <20080831.213607.09599119.davem@davemloft.net> <20080901.012827.193698949.davem@davemloft.net> <20080901190307.f7ba8cca.sfr@canb.auug.org.au> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: Received: from mail.suse.de ([195.135.220.2]:44686 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbYIAJ0k (ORCPT ); Mon, 1 Sep 2008 05:26:40 -0400 In-Reply-To: <20080901190307.f7ba8cca.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Miller , linux-next@vger.kernel.org At Mon, 1 Sep 2008 19:03:07 +1000, Stephen Rothwell wrote: > > On Mon, 01 Sep 2008 10:34:32 +0200 Takashi Iwai wrote: > > > > > 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. > > Thats fine by me. Looks like whoever gets in first in the merge window > wins :-) Well, basically I just need to leave the code David changes as is so that the patch doesn't conflict. Then git will resolve the rest gracefully. I fixed the conflict and rebuilt my tree now. Tomorrow's linux-next merge should work without conflict. Let me know if you still get a conflict. thanks, Takashi