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

[Takashi Iwai]

On Mon, 05 Oct 2026 15:14:03 +0200,
Andrew Morton wrote:
> 
> 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?

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

> I'll drop the mm.git copy now.


thanks,

Takashi