From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolin Chen Subject: Re: [PATCH bisect 0/2] ASoC: fsl_sai: Overwrite trigger() Date: Tue, 1 Apr 2014 18:54:48 +0800 Message-ID: <20140401105446.GA27586@MrMyself> References: <1396322227-482-1-git-send-email-Guangyu.Chen@freescale.com> <20140401110412.GJ2269@sirena.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Content-Disposition: inline In-Reply-To: <20140401110412.GJ2269@sirena.org.uk> Sender: linux-kernel-owner@vger.kernel.org To: Mark Brown Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org, timur@tabi.org, Li.Xiubo@freescale.com List-Id: alsa-devel@alsa-project.org On Tue, Apr 01, 2014 at 12:04:12PM +0100, Mark Brown wrote: > On Tue, Apr 01, 2014 at 11:17:05AM +0800, Nicolin Chen wrote: > > > * The patches are generated by using '-U2' because the default '-U3' > > would conflict the baseline without fsl_sai_isr patches. > > What are these "fsi_sai_isr patches"? Ah..I should have mentioned the full patch name: e2681a1 ASoC: fsl_sai: Add isr to deal with error flag The patch conflicts against that asoc-3.15-4 tag at the fsl_sai.h because this isr patch added some new macros to it. Thank you, Nicolin Chen