Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 22 Nov 2022 10:06:11 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Takashi Iwai <tiwai@suse.de>
Subject: linux-next: manual merge of the dma-mapping tree with Linus' tree
Message-ID: <20221122100611.13a374e2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/DPWGVDULKSX8GhPoi./p7fM";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/DPWGVDULKSX8GhPoi./p7fM
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  sound/core/memalloc.c

between commits:

  9736a325137b ("ALSA: memalloc: Don't fall back for SG-buffer with IOMMU")
  9d8e536d36e7 ("ALSA: memalloc: Try dma_alloc_noncontiguous() at first")

from Linus' tree and commit:

  3306877aff07 ("ALSA: memalloc: don't pass bogus GFP_ flags to dma_alloc_*=
")

from the dma-mapping 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.

--=20
Cheers,
Stephen Rothwell

diff --cc sound/core/memalloc.c
index ba095558b6d1,fe03cf796e8b..000000000000
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@@ -543,9 -541,9 +542,9 @@@ static void *snd_dma_noncontig_alloc(st
  	void *p;
 =20
  	sgt =3D dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
- 				      DEFAULT_GFP, 0);
+ 				      DEFAULT_GFP | __GFP_COMP, 0);
 -	if (!sgt) {
  #ifdef CONFIG_SND_DMA_SGBUF
 +	if (!sgt && !get_dma_ops(dmab->dev.dev)) {
  		if (dmab->dev.type =3D=3D SNDRV_DMA_TYPE_DEV_WC_SG)
  			dmab->dev.type =3D SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
  		else

--Sig_/DPWGVDULKSX8GhPoi./p7fM
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN8BGQACgkQAVBC80lX
0GylTAf+PqGca0yV+5axvYVYmDlGGX8U9NowKWW6qUbaSmp67IPLbPoTHS68C6xZ
9gMGfYRzUQXcW7IEj2lZ86E1akyJVKEHW/kwZRIuB8yMzsVtY9QxEgG3y+Y0ZKvJ
/JySdQv3GygVF3oM7ZN6iwX1Rk8KU3uQ/8g4JKTIGrnY6U1IGfshEDVhsCfvbBYP
oGGDPupxwJ8/Qtp3X8bL9Aqvwzb/sq2wukzwnEOAgeUOQznZ8OwgtFrMXn3PLLS8
j9OQLDKb6NS3+jwITSbN8NrdfUUOoNNL4oeh1dYKEAlHWEoqotGYe14EGWYwBsbb
Wtp4Bsk0qX6sKCWfPkFO+mxj7yHkcg==
=eHra
-----END PGP SIGNATURE-----

--Sig_/DPWGVDULKSX8GhPoi./p7fM--