linux-kernel - linux-next: manual merge of the uml tree with the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240501091942.1999963d@canb.auug.org.au>
Date: Wed, 1 May 2024 09:19:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Richard Weinberger <richard@....at>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@...ux.dev>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Suren Baghdasaryan <surenb@...gle.com>, Tiwei
 Bie <tiwei.btw@...group.com>
Subject: linux-next: manual merge of the uml tree with the mm tree

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.

-- 
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);
  
 -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);
  
  #endif /* __UM_MALLOC_H__ */
  

Content of type "application/pgp-signature" skipped