Hello Stephen,
On Mon, Sep 16, 2024 at 02:58:00PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound tree got a conflict in:
>
> sound/soc/cirrus/edb93xx.c
>
> between commit:
>
> 7a9a9110d765 ("ASoC: cirrus: edb93xx: Delete driver")
>
> from the arm-soc tree and commit:
>
> 130af75b5c05 ("ASoC: Switch back to struct platform_driver::remove()")
>
> from the sound tree.
>
> I fixed it up (I removed the file) and can carry the fix as
> necessary.
JFTR: I didn't check your tree, but that sounds like the right
resolution.
Thanks for your effort to run linux-next!
Uwe
Attachment:
signature.asc
Description: PGP signature
