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

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

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

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 arm64 tree and commit: 0a2634348ef8 ("set_memory: allow querying whether

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

Hi all, Today's linux-next merge of the akpm tree got a conflict in: mm/filemap.c between commit: f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") from the arm64 tree and patch: "secretmem: add memcg accounting" from the akpm tree. I fixed it up (see below) and

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

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

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

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

Hi all, 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 tree and commit: 44a7127eb3a4 ("arm64: mte: add in-kernel MTE helpers") from the

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

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: > >

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

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: 68cd215d6529 ("arm64: kasan: allow enabling in-kernel MTE") from the akpm tree. I

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

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

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

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

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

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

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

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

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

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