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

[Stephen Rothwell]

Hi all,

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

  arch/arm64/include/asm/memory.h

between commit:

  6e8830674ea7 ("arm64: kasan: Increase stack size for KASAN_EXTRA")

from the arm64 tree and commit:

  2a4689e7f69c ("kasan, arm64: adjust shadow size for tag-based mode")

from the akpm-current 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/arm64/include/asm/memory.h
index f771452d08c4,1235fa492307..000000000000
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@@ -77,19 -65,13 +68,18 @@@
  #define KERNEL_END        _end
  
  /*
-  * KASAN requires 1/8th of the kernel virtual address space for the shadow
-  * region. KASAN can bloat the stack significantly, so double the (minimum)
-  * stack size when KASAN is in use, and then double it again if KASAN_EXTRA is
-  * on.
+  * Generic and tag-based KASAN require 1/8th and 1/16th of the kernel virtual
+  * address space for the shadow region respectively. They can bloat the stack
 - * significantly, so double the (minimum) stack size when they are in use.
++ * significantly, so double the (minimum) stack size when they are in use,
++ * and then double it again if KASAN_EXTRA is on.
   */
  #ifdef CONFIG_KASAN
- #define KASAN_SHADOW_SCALE_SHIFT 3
  #define KASAN_SHADOW_SIZE	(UL(1) << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT))
 +#ifdef CONFIG_KASAN_EXTRA
 +#define KASAN_THREAD_SHIFT	2
 +#else
  #define KASAN_THREAD_SHIFT	1
 +#endif /* CONFIG_KASAN_EXTRA */
  #else
  #define KASAN_SHADOW_SIZE	(0)
  #define KASAN_THREAD_SHIFT	0

Attachment: pgpD9FQzMKawJ.pgp
Description: OpenPGP digital signature