Messages in this thread | | | Date | Tue, 1 Apr 2014 18:54:48 +0800 | From | Nicolin Chen <> | Subject | Re: [PATCH bisect 0/2] ASoC: fsl_sai: Overwrite trigger() |
| |
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
| |