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

[Andrew Morton]

On Mon, 5 Oct 2026 13:21:34 +0200 Mark Brown <broonie@xxxxxxxxxx> 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")
> 
> 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 <hebaoquan@xxxxxxxxxx>
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/20260903111836.1777265-4-hebaoquan@xxxxxxxxxx
Signed-off-by: Baoquan He <hebaoquan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Harry Yoo <harry@xxxxxxxxxx>
---

 sound/mips/snd-n64.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/sound/mips/snd-n64.c~alsa-n64-dont-use-gfp_dma-when-calling-dma_alloc_coherent
+++ a/sound/mips/snd-n64.c
@@ -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;
_