Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
tools/testing/radix-tree/linux/gfp.h
between commit:
5a198c3f9b0b ("tools: Move gfp.h and slab.h from radix-tree to lib")
from the memblock tree and commit:
752fdadfaf92 ("mm: discard __GFP_ATOMIC")
from the akpm-current tree.
I fixed it up (I deleted the file and then added 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.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 10 Feb 2022 17:44:54 +1100
Subject: [PATCH] fix pu for "tools: Move gfp.h and slab.h from radix-tree to lib"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
tools/include/linux/gfp.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/include/linux/gfp.h b/tools/include/linux/gfp.h
index b238dbc9eb85..56eec4445bc9 100644
--- a/tools/include/linux/gfp.h
+++ b/tools/include/linux/gfp.h
@@ -12,7 +12,6 @@
#define __GFP_FS 0x80u
#define __GFP_NOWARN 0x200u
#define __GFP_ZERO 0x8000u
-#define __GFP_ATOMIC 0x80000u
#define __GFP_ACCOUNT 0x100000u
#define __GFP_DIRECT_RECLAIM 0x400000u
#define __GFP_KSWAPD_RECLAIM 0x2000000u
@@ -20,7 +19,7 @@
#define __GFP_RECLAIM (__GFP_DIRECT_RECLAIM | __GFP_KSWAPD_RECLAIM)
#define GFP_ZONEMASK 0x0fu
-#define GFP_ATOMIC (__GFP_HIGH | __GFP_ATOMIC | __GFP_KSWAPD_RECLAIM)
+#define GFP_ATOMIC (__GFP_HIGH | __GFP_KSWAPD_RECLAIM)
#define GFP_KERNEL (__GFP_RECLAIM | __GFP_IO | __GFP_FS)
#define GFP_NOWAIT (__GFP_KSWAPD_RECLAIM)
--
2.34.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpGUqi8RD0sL.pgp
Description: OpenPGP digital signature
