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

[Stephen Rothwell]

Hi Andrew,

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

  arch/arm64/include/asm/cacheflush.h

between commit:

  9b0aa14e3155 ("arm64: mm: add set_memory_valid()")

from the arm64 tree and patch:

  "treewide: move set_memory_* functions away from cacheflush.h"

from the akpm tree.

I fixed it up (see below - not ideal ...) 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/cacheflush.h
index 728f933cef8c,7db6962fc4b4..000000000000
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@@ -150,10 -151,4 +151,6 @@@ static inline void flush_cache_vunmap(u
  {
  }
  
- int set_memory_ro(unsigned long addr, int numpages);
- int set_memory_rw(unsigned long addr, int numpages);
- int set_memory_x(unsigned long addr, int numpages);
- int set_memory_nx(unsigned long addr, int numpages);
 +int set_memory_valid(unsigned long addr, unsigned long size, int enable);
 +
  #endif