Received-SPF: pass (google.com: domain of linux-kernel+bounces-164794-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 1 May 2024 09:19:42 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Richard Weinberger <richard@nod.at>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@linux.dev>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Suren Baghdasaryan <surenb@google.com>, Tiwei
 Bie <tiwei.btw@antgroup.com>
Subject: linux-next: manual merge of the uml tree with the mm tree
Message-ID: <20240501091942.1999963d@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/0jI0Ig61DGvLhGsB1skwXzx";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/0jI0Ig61DGvLhGsB1skwXzx
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/um/include/shared/um_malloc.h

between commit:

  88ae5fb755b0 ("mm: vmalloc: enable memory allocation profiling")

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

  0c2b208c8b79 ("um: Fix the declaration of vfree")

from the uml 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 arch/um/include/shared/um_malloc.h
index bf503658f08e,d25084447c69..000000000000
--- a/arch/um/include/shared/um_malloc.h
+++ b/arch/um/include/shared/um_malloc.h
@@@ -11,9 -11,8 +11,9 @@@
  extern void *uml_kmalloc(int size, int flags);
  extern void kfree(const void *ptr);
 =20
 -extern void *vmalloc(unsigned long size);
 +extern void *vmalloc_noprof(unsigned long size);
 +#define vmalloc(...)		vmalloc_noprof(__VA_ARGS__)
- extern void vfree(void *ptr);
+ extern void vfree(const void *ptr);
 =20
  #endif /* __UM_MALLOC_H__ */
 =20

--Sig_/0jI0Ig61DGvLhGsB1skwXzx
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYxfI4ACgkQAVBC80lX
0Gx0mQf+LJfLl7KCt9vtWc75mp20oGx6xoBGpxZGs6CPmLsaYC24xoGfbrDeCRJy
L+Iwwx8503LXpkROLpeDp3ZX0v9v41UM08spDgTbxovsnIHgAqHOAi/msdzNtW0/
Qf19/0flbc8bAKdimSLHuwdl/ATkALytxypel79+mTs8Nbj5odrPsbQIYtx4azob
Jv5LGDLw7t1Fyhe0EuIvwWHUrrKIVY6WYqgFueH9ZvJn2Bdu3sOw8L0gnMHuSwxT
rI1DuHXp6V79I/AHl9X0jsGBqYJMrLw+Y0c88rtnCiQNhg+9jnHwRV9aqaL/lxyu
Fu4nyTRisd4QPFKK1xDFWAl5E9aDXg==
=Lnty
-----END PGP SIGNATURE-----

--Sig_/0jI0Ig61DGvLhGsB1skwXzx--