linux-kernel - linux-next: manual merge of the sound-asoc 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>] [day] [month] [year] [list]

Message-ID: <20230110111731.45ff9c70@canb.auug.org.au>
Date:   Tue, 10 Jan 2023 11:17:31 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        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: linux-next: manual merge of the sound-asoc tree with the arm-soc
 tree

Hi all,

Today's linux-next merge of the sound-asoc tree got conflicts in:

  sound/soc/pxa/e740_wm9705.c
  sound/soc/pxa/e750_wm9705.c
  sound/soc/pxa/e800_wm9712.c

between commit:

  64725fa9ce08 ("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")

from the sound-asoc 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped