Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751482AbaDALJN (ORCPT ); Tue, 1 Apr 2014 07:09:13 -0400 Received: from ch1ehsobe003.messaging.microsoft.com ([216.32.181.183]:31265 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbaDALJM (ORCPT ); Tue, 1 Apr 2014 07:09:12 -0400 X-Forefront-Antispam-Report: CIP:70.37.183.190;KIP:(null);UIP:(null);IPV:NLI;H:mail.freescale.net;RD:none;EFVD:NLI X-SpamScore: -2 X-BigFish: VS-2(zz98dI1432Izz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzzz2dh2a8h839h944hd25hd2bhf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1fe8h1ff5h209eh2216h22d0h2336h2438h2461h2487h24d7h2516h2545h255eh25cch25f6h2605h262fh268bh1155h) Date: Tue, 1 Apr 2014 18:54:48 +0800 From: Nicolin Chen To: Mark Brown CC: , , , , Subject: Re: [PATCH bisect 0/2] ASoC: fsl_sai: Overwrite trigger() 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" Content-Disposition: inline In-Reply-To: <20140401110412.GJ2269@sirena.org.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn% Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 -- 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/