linux-next: manual merge of the sound-asoc tree with the origin tree

[Mark Brown]

Hi all,

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

  sound/soc/amd/acp/acp-sdw-sof-mach.c

between commit:

  4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")

from the origin tree and commit:

  7de8faa0fb6ed ("ASoC: amd: acp: add ACP7.B/7.F SoundWire link count for machine driver")

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.

diff --cc sound/soc/amd/acp/acp-sdw-sof-mach.c
index 8336eb5c82ea9,1d7487c872657..0000000000000
--- a/sound/soc/amd/acp/acp-sdw-sof-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c
@@@ -374,16 -406,28 +406,28 @@@ static int mc_probe(struct platform_dev
  	struct snd_soc_card *card;
  	struct amd_mc_ctx *amd_ctx;
  	struct asoc_sdw_mc_private *ctx;
- 	int amp_num = 0, i;
+ 	int amp_num = 0, i, dmic_num;
  	int ret;
  
 -	amd_ctx = devm_kzalloc(&pdev->dev, sizeof(*amd_ctx), GFP_KERNEL);
 +	amd_ctx = devm_kzalloc_obj(&pdev->dev, *amd_ctx);
  	if (!amd_ctx)
  		return -ENOMEM;
  
  	amd_ctx->acp_rev = mach->mach_params.subsystem_rev;
- 	amd_ctx->max_sdw_links = ACP63_SDW_MAX_LINKS;
+ 	switch (amd_ctx->acp_rev) {
+ 	case ACP7B_PCI_REV:
+ 	case ACP7F_PCI_REV:
+ 		amd_ctx->max_sdw_links = ACP7X_SDW_MAX_LINKS;
+ 		break;
+ 	default:
+ 		amd_ctx->max_sdw_links = ACP63_SDW_MAX_LINKS;
+ 		break;
+ 	}
+ 	if (mach->pdata) {
+ 		pdm_pdata = mach->pdata;
+ 		amd_ctx->pdm_sel = pdm_pdata->pdm_sel;
+ 	}
 -	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
 +	ctx = devm_kzalloc_obj(&pdev->dev, *ctx);
  	if (!ctx)
  		return -ENOMEM;
  	ctx->codec_info_list_count = asoc_sdw_get_codec_info_list_count();

Attachment: signature.asc
Description: PGP signature