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

2021-03-22 Thread Catalin Marinas
On Mon, Mar 22, 2021 at 05:40:23PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > arch/arm64/mm/mmu.c > > between commit: > > 87143f404f33 ("arm64: mm: use XN table mapping attributes for the linear > region") > > from the arm

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

2020-11-30 Thread Catalin Marinas
On Mon, Nov 30, 2020 at 06:48:35PM +1100, Stephen Rothwell wrote: > On Mon, 30 Nov 2020 18:28:40 +1100 Stephen Rothwell > wrote: > > Today's linux-next merge of the akpm tree got a conflict in: > > > > arch/arm64/kernel/mte.c > > > > between commit: > > > > e710c29e0177 ("arm64: mte: make

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

2020-11-29 Thread Stephen Rothwell
Hi all, On Mon, 30 Nov 2020 18:28:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm tree got a conflict in: > > arch/arm64/kernel/mte.c > > between commit: > > e710c29e0177 ("arm64: mte: make the per-task SCTLR_EL1 field usable > elsewhere") > > from the arm64 tr

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

2020-11-25 Thread Peter Collingbourne
On Wed, Nov 25, 2020 at 11:06 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the akpm tree got a conflict in: > > arch/arm64/mm/proc.S > > between commit: > > 49b3cf035edc ("kasan: arm64: set TCR_EL1.TBID1 when enabled") > > from the arm64 tree and commit: > > 68cd215

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

2017-04-07 Thread Stephen Rothwell
Hi Catalin, On Fri, 7 Apr 2017 09:48:35 +0100 Catalin Marinas 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-n

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

2017-04-07 Thread Catalin Marinas
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: