[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231024071929.88898-1-wangweidong.a@awinic.com>
Date: Tue, 24 Oct 2023 15:19:28 +0800
From: wangweidong.a@...nic.com
To: broonie@...nel.org
Cc: 13916275206@....com, ajye_huang@...pal.corp-partner.google.com,
alsa-devel@...a-project.org, arnd@...db.de,
ckeepax@...nsource.cirrus.com, colin.i.king@...il.com,
conor+dt@...nel.org, dan.carpenter@...aro.org,
devicetree@...r.kernel.org, harshit.m.mogalapalli@...cle.com,
herve.codina@...tlin.com, krzysztof.kozlowski+dt@...aro.org,
lgirdwood@...il.com, linus.walleij@...aro.org,
linux-kernel@...r.kernel.org, liweilei@...nic.com, perex@...ex.cz,
rf@...nsource.cirrus.com, robh+dt@...nel.org, ryans.lee@...log.com,
sebastian.reichel@...labora.com, shumingf@...ltek.com,
tiwai@...e.com, trix@...hat.com, wangweidong.a@...nic.com,
yijiangtao@...nic.com
Subject: Re: [PATCH V2 3/4] ASoC: codecs: Add code for bin parsing compatible with aw88399
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@...nel.org wrote:
> On Fri, Oct 20, 2023 at 04:34:25PM +0800, wangweidong.a@...nic.com wrote:
>> From: Weidong Wang <wangweidong.a@...nic.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
Powered by blists - more mailing lists