I'm very sorry, just sent the wrong patch, it was dut to my missteps. Thank you very much for the review, but I have some questions I'd like to ask.
On Mon, Oct 23, 2023 at 13:29:03 +0100, broonie@kernel.org wrote:
On Fri, Oct 20, 2023 at 04:34:25PM +0800, wangweidong.a@awinic.com wrote:
From: Weidong Wang wangweidong.a@awinic.com
Add aw88399 compatible code to the aw88395_lib.c file so that it can parse aw88399's bin file.
This doesn't apply against current code, please check and resend:
Applying: ASoC: codecs: Add code for bin parsing compatible with aw88399 Using index info to reconstruct a base tree... M sound/soc/codecs/aw88395/aw88395_lib.c M sound/soc/codecs/aw88395/aw88395_reg.h Falling back to patching base and 3-way merge... Auto-merging sound/soc/codecs/aw88395/aw88395_reg.h Auto-merging sound/soc/codecs/aw88395/aw88395_lib.c
I generated the patch based on the mainline branch, Why would there be a conflict? I know that I made a change to this file when I committed aw87390 and that the change was in the Linux-next branch, but the two changes are in different parts of the file.
Best regards, Weidong Wang