Date: Thu, 23 Jul 2009 08:09:45 +0200
Message-ID: <s5hvdlkvsk6.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
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>
Subject: Re: linux-next: manual merge of the sound tree with the davinci tree
In-Reply-To: <20090723112110.e42430e9.sfr@canb.auug.org.au>
References: <20090723112110.e42430e9.sfr@canb.auug.org.au>
User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3
 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 928
Lines: 26

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/