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

Message-ID: <20231030114115.2a9f0260@canb.auug.org.au>
Date:   Mon, 30 Oct 2023 11:41:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Takashi Iwai <tiwai@...e.de>, Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>
Cc:     Chancel Liu <chancel.liu@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Subject: linux-next: manual merge of the sound tree with the
 sound-asoc-fixes tree

Hi all,

Today's linux-next merge of the sound tree got a conflict in:

  sound/soc/soc-pcm.c

between commit:

  f0220575e65a ("ASoC: soc-dai: add flag to mute and unmute stream during trigger")

from the sound-asoc-fixes tree and commit:

  3efcb471f871 ("ASoC: soc-pcm.c: Make sure DAI parameters cleared if the DAI becomes inactive")

from the sound tree.

I fixed it up (I just used the latter) 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