linux-kernel - Re: linux-next: manual merge of the sound tree with the arm-soc tree

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]

Message-ID: <rn7zribry4zpacbqynr5ljdlpj6vjs37nn2cs2lffoee3ehilx@kfthit56sgit>
Date: Mon, 16 Sep 2024 10:42:25 +0200
From: Uwe Kleine-König <u.kleine-koenig@...libre.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Takashi Iwai <tiwai@...e.de>, Olof Johansson <olof@...om.net>, 
	Arnd Bergmann <arnd@...db.de>, Alexander Sverdlin <alexander.sverdlin@...il.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, 
	ARM <linux-arm-kernel@...ts.infradead.org>, Mark Brown <broonie@...nel.org>, 
	Nikita Shubin <nikita.shubin@...uefel.me>
Subject: Re: linux-next: manual merge of the sound tree with the arm-soc tree

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

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