Subject: linux-next: manual merge of the arm64 tree with the arm64-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 27 Jun 2019 09:35:03 +1000

Hi all,

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

  arch/arm64/kernel/module.c

between commit:

  6f496a555d93 ("arm64: kaslr: keep modules inside module region when KASAN is enabled")

from the arm64-fixes tree and commit:

  7dfac3c5f40e ("arm64: module: create module allocations without exec permissions")

from the arm64 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/kernel/module.c
index 71530e080ecc,5b5936b7868c..000000000000
--- a/arch/arm64/kernel/module.c
+++ b/arch/arm64/kernel/module.c
@@@ -29,12 -39,9 +29,12 @@@ void *module_alloc(unsigned long size
  	if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
  		gfp_mask |= __GFP_NOWARN;
  
 +	if (IS_ENABLED(CONFIG_KASAN))
 +		/* don't exceed the static module region - see below */
 +		module_alloc_end = MODULES_END;
 +
  	p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,
- 				module_alloc_end, gfp_mask, PAGE_KERNEL_EXEC, 0,
 -				module_alloc_base + MODULES_VSIZE,
 -				gfp_mask, PAGE_KERNEL, 0,
++				module_alloc_end, gfp_mask, PAGE_KERNEL, 0,
  				NUMA_NO_NODE, __builtin_return_address(0));
  
  	if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&