Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Tue, 24 Oct 2023 13:42:02 +0100
From:   Mark Brown <broonie@kernel.org>
To:     wangweidong.a@awinic.com
Cc:     13916275206@139.com, ajye_huang@compal.corp-partner.google.com,
        alsa-devel@alsa-project.org, arnd@arndb.de,
        ckeepax@opensource.cirrus.com, colin.i.king@gmail.com,
        conor+dt@kernel.org, dan.carpenter@linaro.org,
        devicetree@vger.kernel.org, harshit.m.mogalapalli@oracle.com,
        herve.codina@bootlin.com, krzysztof.kozlowski+dt@linaro.org,
        lgirdwood@gmail.com, linus.walleij@linaro.org,
        linux-kernel@vger.kernel.org, liweilei@awinic.com, perex@perex.cz,
        rf@opensource.cirrus.com, robh+dt@kernel.org, ryans.lee@analog.com,
        sebastian.reichel@collabora.com, shumingf@realtek.com,
        tiwai@suse.com, trix@redhat.com, yijiangtao@awinic.com
Subject: Re: [PATCH V2 3/4] ASoC: codecs: Add code for bin parsing compatible
 with aw88399
Message-ID: <27dd3dfb-7a40-4e26-b8c2-e432c30a0eea@sirena.org.uk>
References: <21bfa0bb-d936-402d-9ca9-6bcf181a0f35@sirena.org.uk>
 <20231024071929.88898-1-wangweidong.a@awinic.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="pL7UoU2fS9tXvDvv"
Content-Disposition: inline
In-Reply-To: <20231024071929.88898-1-wangweidong.a@awinic.com>
Precedence: bulk


--pL7UoU2fS9tXvDvv
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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

> I generated the patch based on the mainline branch,=20
> Why would there be a conflict? I know that I made a change to
> this file when I committed aw87390 and that=20
> the change was in the Linux-next branch, but the two=20
> 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.

--pL7UoU2fS9tXvDvv
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmU3u5kACgkQJNaLcl1U
h9Dr6Qf/fdkNinl8wVxXP3U0qwaV15ASSfA38GeqDIqp+FlZSN61aMRCAfgEvI0y
QiJ1yqwLMrQzbWZcss2SnDi3N0J7KAqe3DXDHyH5FGYDxgSpMegLxDojqD6ecoEV
vf25mLtwq6w7/2LHuoJqiPDeE+LARk28dFHrIeAiQAl0NDxBX+Q84heKKbTzf0iC
RxFTOfdtBPxGmm0pyA7bm647VGZ5cqC2Yres0FD+ES20QnEh0lRImX7PY8yCAvyu
ykm+apBEZeKrq27nTFpmG4tNSFh2tCmlPCVhM4O2kGflQ0YHQUa0S8HxrnKiXSRb
2A8LUloo0+K+kEFa6oTbzwdjhOjcGA==
=RVdx
-----END PGP SIGNATURE-----

--pL7UoU2fS9tXvDvv--