Subject: linux-next: manual merge of the akpm-current tree with the xfs tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 11 Aug 2021 18:33:20 +1000

Hi all,

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

  include/linux/mm.h

between commit:

  de2860f46362 ("mm: Add kvrealloc()")

from the xfs tree and commit:

  dcda39e2fd16 ("mm: move kvmalloc-related functions to slab.h")

from the akpm-current tree.

I fixed it up (I moved it to slab.h like the latter did with the other
functions - 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.

From: Stephen Rothwell <[email-masked]>
Date: Wed, 11 Aug 2021 18:30:48 +1000
Subject: [PATCH] move kvrealloc to slab.h as well

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 include/linux/slab.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 2c0d80cca6b8..05b8a316dc33 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -761,6 +761,8 @@ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags)
 	return kvmalloc_array(n, size, flags | __GFP_ZERO);
 }
 
+void *kvrealloc(const void *p, size_t oldsize, size_t newsize,
+		gfp_t flags);
 void kvfree(const void *addr);
 void kvfree_sensitive(const void *addr, size_t len);
 
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell