Hi,
On 05/13/2018 04:29 AM, Mark Brown wrote:
On Fri, May 11, 2018 at 03:29:18PM +0200, Hans de Goede wrote:
Hi Mark, et. al.,
Here is v2 of the remaining patches from my rt5640 jack-detect series.
As requested this is rebased on your sound/for-next branch, so this should apply cleanly now.
That's not what git is telling me:
Applying: ASoC: Intel: bytcr_rt5640: Use device properties for setting up dmic error: patch failed: sound/soc/intel/boards/bytcr_rt5640.c:556 error: sound/soc/intel/boards/bytcr_rt5640.c: patch does not apply Patch failed at 0001 ASoC: Intel: bytcr_rt5640: Use device properties for setting up dmic Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
If I try with -3 it tells me that it doesn't even know the SHA1s which suggests you have something else in your tree?
Yes, I still have the "ASoC: Intel: bytcr_rt5640: Drop unwanted ignore_suspend settings" patch, for which we never really finished the discussion.
I will drop that for now and send a v3 which should apply cleanly, sorry about this.
As for the ignore_suspend patch I will run some tests to make sure that things work ok without it and then just drop it permanently.
Regards,
Hans