Hi all,

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

  sound/soc/codecs/wcd939x-sdw.c

between commit:

  7a8447fc71a0 ("ASoC: codecs: wcd939x-sdw: use devres for regmap allocation")

from the sound-asoc tree and commit:

  478f3890709a ("soundwire: Make remove function return no value")

from the soundwire 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.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/codecs/wcd939x-sdw.c
index 399dfba79aa2,965c768e7995..000000000000
--- a/sound/soc/codecs/wcd939x-sdw.c
+++ b/sound/soc/codecs/wcd939x-sdw.c
@@@ -1401,15 -1406,23 +1401,13 @@@ static int wcd9390_probe(struct sdw_sla
  	pm_runtime_set_suspended(dev);
  
  	return 0;
 -
 -err_free_regmap:
 -	if (wcd->regmap)
 -		regmap_exit(wcd->regmap);
 -
 -	return ret;
  }
  
- static int wcd9390_remove(struct sdw_slave *pdev)
+ static void wcd9390_remove(struct sdw_slave *pdev)
  {
  	struct device *dev = &pdev->dev;
 -	struct wcd939x_sdw_priv *wcd = dev_get_drvdata(dev);
  
  	component_del(dev, &wcd_sdw_component_ops);
--
- 	return 0;
 -	if (wcd->regmap)
 -		regmap_exit(wcd->regmap);
  }
  
  static const struct sdw_device_id wcd9390_slave_id[] = {