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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 21 Feb 2023 09:27:59 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Takashi Iwai <tiwai@...e.de>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>, Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>
Subject: Re: linux-next: manual merge of the sound tree with the arm-soc
 tree

Hi all,

On Fri, 17 Feb 2023 11:23:27 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the sound tree got conflicts in:
> 
>   sound/soc/cirrus/ep93xx-ac97.c
>   sound/soc/pxa/e740_wm9705.c
>   sound/soc/pxa/e750_wm9705.c
>   sound/soc/pxa/e800_wm9712.c
>   sound/soc/ti/davinci-vcif.c
> 
> between commits:
> 
>   2b45e1fa9398 ("ASoC: remove unused ep93xx files")
>   efe81e9a9273 ("ASoC: remove unused davinci support")
>   b401d1fd8053 ("ASoC: pxa: remove unused board support")
> 
> from the arm-soc tree and commits:
> 
>   f2211ac36ab0 ("ASoC: pxa: e740_wm9705: Drop empty platform remove function")
>   4ed923e8076b ("ASoC: pxa: e750_wm9705: Drop empty platform remove function")
>   394296eee2c2 ("ASoC: pxa: e800_wm9712: Drop empty platform remove function")
>   0e478b88b257 ("ASoC: cirrus: use helper function")
>   2abde57fb82b ("ASoC: ti: use helper function")
> 
> from the sound tree.
> 
> I fixed it up (I just removed the files) 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 the
sound-asoc-fixes tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped