From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH 16/17] ASoC: Basic split of mpc5200 DMA code out from mpc5200_psc_i2s Date: Tue, 28 Apr 2009 18:51:02 +0200 Message-ID: References: <20090428152256.GB2244@rakim.wolfsonmicro.main> <1240932222-3718-16-git-send-email-broonie@opensource.wolfsonmicro.com> <9e4733910904280859t6409e9b7w4eccee65959598e5@mail.gmail.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 2307C10383F for ; Tue, 28 Apr 2009 18:51:03 +0200 (CEST) In-Reply-To: <9e4733910904280859t6409e9b7w4eccee65959598e5@mail.gmail.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: Jon Smirl Cc: alsa-devel@alsa-project.org, Mark Brown List-Id: alsa-devel@alsa-project.org At Tue, 28 Apr 2009 11:59:01 -0400, Jon Smirl wrote: > = > On Tue, Apr 28, 2009 at 11:46 AM, Takashi Iwai wrote: > > At Tue, 28 Apr 2009 16:23:41 +0100, > > Mark Brown wrote: > >> > >> From: Jon Smirl > >> > >> Basic split of mpc5200 DMA code out from i2s into a standalone file. > >> > >> [Fixed trailing whitespace -- broonie.] > >> > >> Signed-off-by: Jon Smirl > >> Acked-by: Grant Likely > >> Signed-off-by: Mark Brown > > > > This patch conflicts with the last patch I merged to add > > SNDRV_PCM_INFO_BATCH to some drivers including mpc5200. > > (It's in fix/pcm-info-batch branch and not merged to */asoc branch > > =A0yet. =A0Feel free to pull to your tree by yourself.) > > And, the jiffies check shall be anyway fixed in the upstream PCM core > > side, thus there is no big merit to hurry to merge the unfinished > > changes now. > > > > So, could you back off mpc5200 changes and wait for a while until the > > issue regarding PCM jiffies-check is resolved? > = > This is why I was pushing so hard to get the patches that split the > files in. And this is why I am against pulling now :) Takashi