Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1618546 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 09:50 +0200
    Re: linux-next: manual merge of the akpm tree with the arm64 tree Catalin Marinas <catalin.marinas@arm.com> - 2017-04-07 11:00 +0200
      Re: linux-next: manual merge of the akpm tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 11:30 +0200

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

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

[toc] | [next] | [standalone]

#1618609

Hi Stephen,

On Fri, Apr 07, 2017 at 05:41:20PM +1000, Stephen Rothwell wrote:
> 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.

Thanks for fixing this up. Not ideal, indeed, but I can push a clean-up
patch after -rc1 to move set_memory_valid() to an arm64-specific
set_memory.h (which would include asm-generic/set_memory.h). Given that
my for-next branch is based on 4.11-rc3, I can't do this now without
risking breaking other things.

-- 
Catalin

[toc] | [prev] | [next] | [standalone]

#1618621

Hi Catalin,

On Fri, 7 Apr 2017 09:48:35 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> Thanks for fixing this up. Not ideal, indeed, but I can push a clean-up
> patch after -rc1 to move set_memory_valid() to an arm64-specific
> set_memory.h (which would include asm-generic/set_memory.h). Given that
> my for-next branch is based on 4.11-rc3, I can't do this now without
> risking breaking other things.

Actually, I suspect that the patch in Andrew's series will be updated
to do that.  This part of Andrew's patch series is applied on top of
all the other linux-next trees and is sent to Linus fairly late in the
merge window.
-- 
Cheers,
Stephen Rothwell

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web