Received-SPF: pass (google.com: domain of linux-kernel+bounces-178182-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 14 May 2024 09:41:20 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>, 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: Re: linux-next: manual merge of the block tree with the mm tree
Message-ID: <20240514094120.0ae75f3a@canb.auug.org.au>
In-Reply-To: <20240402112746.3864d8a6@canb.auug.org.au>
References: <20240402112746.3864d8a6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7/k1p.dO.hCk7Kr1E/R2SWx";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/7/k1p.dO.hCk7Kr1E/R2SWx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Tue, 2 Apr 2024 11:27:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Today's linux-next merge of the block tree got a conflict in:
>=20
>   io_uring/io_uring.c
>=20
> between commit:
>=20
>   d3329b3a9d72 ("mm: switch mm->get_unmapped_area() to a flag")
>=20
> from the mm-unstable branhc of the mm tree and commit:
>=20
>   624d801ce45b ("io_uring: move mapping/allocation helpers to a separate =
file")
>=20
> from the block tree.
>=20
> 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.
>=20
> 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"
>=20
> from the mm tree.
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  io_uring/memmap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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 =
*filp, 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

This is now a conflict between the mm-stable tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/7/k1p.dO.hCk7Kr1E/R2SWx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZCpSAACgkQAVBC80lX
0Gw29Af/bx/BTlz7Sk4WnkwezV2xiB4icZ1Fi2BTQX67Ta0Ptgkuhcy5zrgOn1jy
/Qow6hdDC/5b7XNm6+IOj7p79HoMecpmKM6h2oIWwfbg5fk+Hd7nP0CBuhjAt6B8
YoZJeMAWCaz0S00zNj3gamyKfhxsCDPFSmGNBRNuoLcn6B600xdEmcssi6zsz/4M
omd2+KFIWP+CD4IERrCjedLH5+2sJook3WdO9aezxk9Y7+XI80r6Jdo2xbKNwM0g
I8iqPBngkguTNMC5xDbIz5zY19QMGCd92d+avx9LASbFb2Yrwy/AboMrp09XAJja
tMifuhrWKHCr8soUd4+4DdzXd921Yg==
=RQ6q
-----END PGP SIGNATURE-----

--Sig_/7/k1p.dO.hCk7Kr1E/R2SWx--