linux-next: manual merge of the bitmap tree with the arm64 tree

[Stephen Rothwell]

Hi all,

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

  include/linux/gfp.h

between commit:

  70c248aca9e7 ("mm: kasan: Skip unpoisoning of user pages")

from the arm64 tree and commit:

  34973181c728 ("headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>")

from the bitmap tree.

I fixed it up (I used the latter version of this files and applied the
following merge resolution 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@xxxxxxxxxxxxxxxx>
Date: Fri, 15 Jul 2022 19:45:25 +1000
Subject: [PATCH] fix up for "mm: kasan: Skip unpoisoning of user pages"

interacting with "headers/deps: mm: Split <linux/gfp_types.h> out of
<linux/gfp.h>"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/linux/gfp_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/gfp_types.h b/include/linux/gfp_types.h
index 06fc85cee23f..d88c46ca82e1 100644
--- a/include/linux/gfp_types.h
+++ b/include/linux/gfp_types.h
@@ -340,7 +340,7 @@ typedef unsigned int __bitwise gfp_t;
 #define GFP_DMA32	__GFP_DMA32
 #define GFP_HIGHUSER	(GFP_USER | __GFP_HIGHMEM)
 #define GFP_HIGHUSER_MOVABLE	(GFP_HIGHUSER | __GFP_MOVABLE | \
-			 __GFP_SKIP_KASAN_POISON)
+			 __GFP_SKIP_KASAN_POISON | __GFP_SKIP_KASAN_UNPOISON)
 #define GFP_TRANSHUGE_LIGHT	((GFP_HIGHUSER_MOVABLE | __GFP_COMP | \
 			 __GFP_NOMEMALLOC | __GFP_NOWARN) & ~__GFP_RECLAIM)
 #define GFP_TRANSHUGE	(GFP_TRANSHUGE_LIGHT | __GFP_DIRECT_RECLAIM)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgp4KC06C3nit.pgp
Description: OpenPGP digital signature