linux-next: manual merge of the sound tree with the mm tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1877 bytes --]

Hi all,

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

  sound/mips/snd-n64.c

between commit:

  0d62c52af5499 ("ALSA: n64: don't use GFP_DMA when calling dma_alloc_coherent()")

from the mm tree and commit:

  e81f85fd3ca66 ("ALSA: mips: n64: Handle card removal properly")

from the sound 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/mips/snd-n64.c
index e2cf9df15d485,8cc001c58d5e6..0000000000000
--- a/sound/mips/snd-n64.c
+++ b/sound/mips/snd-n64.c
@@@ -296,25 -305,20 +305,20 @@@ static int __init n64audio_probe(struc
  	spin_lock_init(&priv->chan.lock);
  
  	priv->card = card;
+ 	card->private_free = n64audio_free;
  
  	priv->ring_base = dma_alloc_coherent(card->dev, 32 * 1024, &priv->ring_base_dma,
 -					     GFP_DMA|GFP_KERNEL);
 +					     GFP_KERNEL);
- 	if (!priv->ring_base) {
- 		err = -ENOMEM;
- 		goto fail_card;
- 	}
+ 	if (!priv->ring_base)
+ 		return -ENOMEM;
  
  	priv->mi_reg_base = devm_platform_ioremap_resource(pdev, 0);
- 	if (IS_ERR(priv->mi_reg_base)) {
- 		err = PTR_ERR(priv->mi_reg_base);
- 		goto fail_dma_alloc;
- 	}
+ 	if (IS_ERR(priv->mi_reg_base))
+ 		return PTR_ERR(priv->mi_reg_base);
  
  	priv->ai_reg_base = devm_platform_ioremap_resource(pdev, 1);
- 	if (IS_ERR(priv->ai_reg_base)) {
- 		err = PTR_ERR(priv->ai_reg_base);
- 		goto fail_dma_alloc;
- 	}
+ 	if (IS_ERR(priv->ai_reg_base))
+ 		return PTR_ERR(priv->ai_reg_base);
  
  	err = snd_pcm_new(card, "N64 Audio", 0, 1, 0, &pcm);
  	if (err < 0)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]