lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Tue, 24 Oct 2023 13:42:02 +0100
From:   Mark Brown <broonie@...nel.org>
To:     wangweidong.a@...nic.com
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, yijiangtao@...nic.com
Subject: Re: [PATCH V2 3/4] ASoC: codecs: Add code for bin parsing compatible
 with aw88399

On Tue, Oct 24, 2023 at 03:19:28PM +0800, wangweidong.a@...nic.com wrote:

> 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.

I don't know off hand, I didn't check in detail.  It's possible someone
else sent a fix that's been applied and is causing the issue - if you
check out my branch and try to apply the patches hopefully you can
figure out what the problem was.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)

Powered by blists - more mailing lists