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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Aug 2019 16:39:42 +1000

Hi all,

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

  arch/arm64/include/asm/processor.h

between commit:

  b907b80d7ae7 ("arm64: remove pointless __KERNEL__ guards")

from the arm64 tree and commit:

  cd6ee3f76f64 ("arm64, mm: move generic mmap layout functions to mm")

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/processor.h
index ec70762519df,65e2de00913f..000000000000
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@@ -280,8 -281,8 +280,6 @@@ static inline void spin_lock_prefetch(c
  		     "nop") : : "p" (ptr));
  }
  
- #define HAVE_ARCH_PICK_MMAP_LAYOUT
 -#endif
--
  extern unsigned long __ro_after_init signal_minsigstksz; /* sigframe size */
  extern void __init minsigstksz_setup(void);