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] [day] [month] [year] [list]

Message-ID: <20240918095747.508337e4@canb.auug.org.au>
Date: Wed, 18 Sep 2024 09:57:47 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc: Takashi Iwai <tiwai@...e.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>,
 Uwe Kleine-König <u.kleine-koenig@...libre.com>
Subject: Re: linux-next: manual merge of the sound tree with the arm-soc
 tree

Hi all,

On Mon, 16 Sep 2024 14:58:00 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

This is now a conflict between the arm-soc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped