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

Groups > linux.kernel > #1618609

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

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

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

csiph-web