From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: linux-next: manual merge of the sound tree with the davinci tree Date: Fri, 24 Jul 2009 01:10:50 +0200 Message-ID: References: <20090723112110.e42430e9.sfr@canb.auug.org.au> <873a8ni8t7.fsf@deeprootsystems.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Return-path: Received: from cantor2.suse.de ([195.135.220.15]:38014 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753862AbZGWXK4 (ORCPT ); Thu, 23 Jul 2009 19:10:56 -0400 In-Reply-To: <873a8ni8t7.fsf@deeprootsystems.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Kevin Hilman Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chaithrika U S , Pavel Kiryukhin , Naresh Medisetty , Steve Chen , Mark Brown , Sudhakar Rajashekhara At Thu, 23 Jul 2009 10:54:44 -0700, Kevin Hilman wrote: > > Takashi Iwai writes: > > > At Thu, 23 Jul 2009 11:21:10 +1000, > > Stephen Rothwell wrote: > >> > >> Hi Takashi, > >> > >> Today's linux-next merge of the sound tree got a conflict in > >> sound/soc/davinci/davinci-evm.c between commit > >> 95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs, > >> channel mapping and API changes") from the davinci tree and commit > >> 04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver > >> support for DM646x") from the sound tree. > >> > >> The latter removes the code modified by the former. I have just used the > >> latter. > > > > Thanks. I'll try to resolve the conflict in the sound tree, > > e.g. pulling the affecting commit of davinci tree into for-next > > branch. > > I've taken care of this in the DaVinci for-next branch. > > I dropped the davinci changes that change code that were then dropped > by the asoc changes. Ah, great. Then I revert a fix merge in my for-next branch and keep only pure ASoC things. Thanks! Takashi