Received-SPF: pass (google.com: domain of linux-kernel+bounces-127239-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 2 Apr 2024 11:27:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Andrew Morton <akpm@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>, Rick Edgecombe
 <rick.p.edgecombe@intel.com>
Subject: linux-next: manual merge of the block tree with the mm tree
Message-ID: <20240402112746.3864d8a6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/LHq.6lj5WucWIARp22HzB/I";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/LHq.6lj5WucWIARp22HzB/I
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  io_uring/io_uring.c

between commit:

  d3329b3a9d72 ("mm: switch mm->get_unmapped_area() to a flag")

from the mm-unstable branhc of the mm tree and commit:

  624d801ce45b ("io_uring: move mapping/allocation helpers to a separate fi=
le")

from the block tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Apr 2024 11:25:46 +1100
Subject: [PATCH] fix up for "mm: switch mm->get_unmapped_area() to a flag"

from the mm tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 io_uring/memmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io_uring/memmap.c b/io_uring/memmap.c
index acf5e8ca6b28..5c9e70132cd1 100644
--- a/io_uring/memmap.c
+++ b/io_uring/memmap.c
@@ -302,7 +302,7 @@ unsigned long io_uring_get_unmapped_area(struct file *f=
ilp, unsigned long addr,
 #else
 	addr =3D 0UL;
 #endif
-	return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
+	return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags);
 }
=20
 #else /* !CONFIG_MMU */
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/LHq.6lj5WucWIARp22HzB/I
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYLUQIACgkQAVBC80lX
0GwjGwf9HOE0ss2ozYG1VeUfBrXbbsDsrcBJyZ89NUBSSWM8TetAsbl7dWDjNc9Q
T9L7jfb0HGMtErUtjcAZ35O7cqv9Hq1Hpxbc7ty3xDJRP3ohK7RbhkpCORmyf7u3
9SrhkZvQf+PTHVhpgXLWkUjaFu1SHyIyZ58fdRXxAxoUU7mJ5E3oexbCnBfbU4+L
hpX0ROEs7bIZU51kauJj5EQQpZ5Cbodk2Xb/pirKT5oWrSH9RzhcXTIiCs6Rvb8n
1nXqt5rL2c2Wu9isJaLgbNPS34rplHQPQ6BnIrt6vm7+DKLX1sOjk/+B2vJS5HRn
ep4J5fxFJFPFTlx4xGpjiCrfRC6ZkA==
=kQCt
-----END PGP SIGNATURE-----

--Sig_/LHq.6lj5WucWIARp22HzB/I--