Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Mon, 25 Sep 2023 11:54:46 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Takashi Iwai <tiwai@suse.de>
Cc:     Cristian Ciocaltea <cristian.ciocaltea@collabora.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stefan Binding <sbinding@opensource.cirrus.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Message-ID: <20230925115446.12bf0047@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/kFonsbELoWoR1fd.EnROUzm";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/kFonsbELoWoR1fd.EnROUzm
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  sound/pci/hda/cs35l41_hda.c

between commit:

  447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41=
 HDA")

from the sound tree and commit:

  77bf613f0bf0 ("ASoC: cs35l41: Fix broken shared boost activation")

from the sound-asoc tree.

I fixed it up (see below) 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.

--=20
Cheers,
Stephen Rothwell

diff --cc sound/pci/hda/cs35l41_hda.c
index 92b815ce193b,c74faa2ff46c..000000000000
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@@ -555,9 -527,15 +555,9 @@@ static void cs35l41_hda_play_done(struc
 =20
  	dev_dbg(dev, "Play (Complete)\n");
 =20
- 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1, NULL,
+ 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1,
  			      cs35l41->firmware_running);
 -	if (cs35l41->firmware_running) {
 -		regmap_multi_reg_write(reg, cs35l41_hda_unmute_dsp,
 -				       ARRAY_SIZE(cs35l41_hda_unmute_dsp));
 -	} else {
 -		regmap_multi_reg_write(reg, cs35l41_hda_unmute,
 -				       ARRAY_SIZE(cs35l41_hda_unmute));
 -	}
 +	cs35l41_mute(dev, false);
  }
 =20
  static void cs35l41_hda_pause_start(struct device *dev)
@@@ -567,8 -545,8 +567,8 @@@
 =20
  	dev_dbg(dev, "Pause (Start)\n");
 =20
 -	regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mut=
e));
 +	cs35l41_mute(dev, true);
- 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0, NULL,
+ 	cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0,
  			      cs35l41->firmware_running);
  }
 =20

--Sig_/kFonsbELoWoR1fd.EnROUzm
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUQ6GcACgkQAVBC80lX
0GwKNwf+Ll+aOwTj5SE8yKPgegw+AGoTUwNGTJk4ByK8QC9+wRiolbeij44JtmQa
KseedWdBeCrpKMuPwW5ocfj4m4xKhfhrN3GE2arVOJRQksg/nGuOVb7rqNL2k4nK
AgUSo5CkFrgQHAVBrpXSsbi7cb2o7G+KpSyATIU5NebU8tQJZ9sru3xh7WA34V9C
O1DhuwbMUbdQuDbYNsWJbemqlQKzFjyHHkYlNQ+wuNMhQOetoogmjXmS0JiV5c9s
mdZHqt1X4vnG+tw9hb4kpXBOCV+vVDJ/0Oa5cFTgLFP9iN85dA/198Yo7Bi0Rst8
I/IAclCFDtFfvGQfa1Gm8R1BfEwYqw==
=vnK/
-----END PGP SIGNATURE-----

--Sig_/kFonsbELoWoR1fd.EnROUzm--