From mboxrd@z Thu Jan  1 00:00:00 1970
From: Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the sound tree with the davinci tree
Date: Thu, 23 Jul 2009 08:09:45 +0200
Message-ID: <s5hvdlkvsk6.wl%tiwai@suse.de>
References: <20090723112110.e42430e9.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: <linux-next-owner@vger.kernel.org>
Received: from cantor2.suse.de ([195.135.220.15]:41814 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750957AbZGWGJt (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 23 Jul 2009 02:09:49 -0400
In-Reply-To: <20090723112110.e42430e9.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chaithrika U S <chaithrika@ti.com>, Pavel Kiryukhin <pkiryukhin@ru.mvista.com>, Naresh Medisetty <naresh@ti.com>, Steve Chen <schen@mvista.com>, Mark Brown <broonie@opensource.wolfsonmicro.com>, Sudhakar Rajashekhara <sudhakar.raj@ti.com>, Kevin Hilman <khilman@deeprootsystems.com>

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.


Takashi