From: Takashi Iwai Subject: Re: ASoC updates for 3.3 Date: Mon, 30 Jan 2012 16:19:09 +0100 Message-ID: References: <20120130133405.GF4882@opensource.wolfsonmicro.com> <20120130145158.GI4882@opensource.wolfsonmicro.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 84DCB103985 for ; Mon, 30 Jan 2012 16:19:24 +0100 (CET) In-Reply-To: <20120130145158.GI4882@opensource.wolfsonmicro.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: alsa-devel@alsa-project.org, Liam Girdwood List-Id: alsa-devel@alsa-project.org At Mon, 30 Jan 2012 14:51:58 +0000, Mark Brown wrote: > > On Mon, Jan 30, 2012 at 03:27:40PM +0100, Takashi Iwai wrote: > > > But this brings merge conflicts in codecs/wm5100.c. > > If you already resolved in 3.4 branch, please give it, too. > > It's resolved in my for-next branch but not in my 3.4 branch, I'd been > going to merge up an -rc when one appeared with the relevant commits. > If you want to pull my for-next into your for-next that'd solve the > issue for your -next tree which is the issue I guess? Yes, I pulled your for-next tree as of now. thanks, Takashi