Skip to contentSkip to conversation

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

PATCH Mark Brown 3 participants 3 messages Oct 5

Subsystems (2)
Sound Linux-next tree
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

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.

sound/mips/snd-n64.c +0 -0
diff --cc sound/mips/snd-n64.c
index e2cf9df15d485,8cc001c58d5e6..0000000000000
@@@ -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)
#1 lore raw
Quoted 14 lines · On Mon, 5 Oct 2026 13:21:34 +0200 Mark Brown <[email protected]> wrote:

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")

Quoted 8 lines

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.

Thanks.

Easy fix: move mm's little one-liner into the alsa tree.

Takashi, please can you add this?

I'll drop the mm.git copy now.

From: Baoquan He <[email protected]>
Subject: ALSA: n64: don't use GFP_DMA when calling dma_alloc_coherent()
Date: Thu, 3 Sep 2026 19:18:26 +0800

dma_alloc_coherent() allocates the DMA buffer with the device's addressing limitation in mind; the DMA core picks the zone from the device's coherent DMA mask and ignores GFP_DMA passed by the caller. Remove the redundant GFP_DMA flag.

Link https://lore.kernel.org/[email protected] open here
Signed-off-by Baoquan He <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Harry Yoo <[email protected]>

---

 sound/mips/snd-n64.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/mips/snd-n64.c renamed from sound/mips/snd-n64.c~alsa-n64-dont-use-gfp_dma-when-calling-dma_alloc_coherent +1 -1
@@ -298,7 +298,7 @@ static int __init n64audio_probe(struct
 	priv->card = card;
 
 	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;

_

#2 lore raw
Quoted 26 lines · Andrew Morton
Quoted 14 lines · On Mon, 5 Oct 2026 13:21:34 +0200 Mark Brown <[email protected]> wrote:

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")

Quoted 8 lines

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.

Quoted 5 lines

Thanks.

Easy fix: move mm's little one-liner into the alsa tree.

Takashi, please can you add this?

Sure, I applied now to sound.git tree for-next branch.

Quoted 1 line

I'll drop the mm.git copy now.

thanks,

Takashi