Hi Mark, On Fri, May 03, 2019 at 01:27:31PM +0900, Mark Brown wrote:
On Thu, May 02, 2019 at 09:13:58AM +0000, S.j. Wang wrote:
I am checking, but I don't know why this patch failed in your side. I Tried to apply this patch on for-5.1, for 5.2, for-linus and for-next, all are Successful. The git is git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git.
I can't reproduce your problem. Is there any my operation wrong?
The error message I got was:
Applying: ASoC: fsl_esai: Add pm runtime function error: patch failed: sound/soc/fsl/fsl_esai.c:9 error: sound/soc/fsl/fsl_esai.c: patch does not apply Patch failed at 0001 ASoC: fsl_esai: Add pm runtime function
which is the header addition. I can't spot any obvious issues visually looking at the patch, only thing I can think is some kind of whitespace damage somewhere.
I downloaded this v4 from patchwork and resubmitted a v5 for a test. Would you please try to apply that one?
If my v5 works vs. having merge conflict at v4, maybe something wrong with Git version of Shengjiu's? I compared my v5 and his v4 using vimdiff, there is no much difference of whitespace.
Thanks Nicolin