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

2021-04-13 Thread Catalin Marinas
On Tue, Apr 13, 2021 at 06:59:36PM +1000, Stephen Rothwell wrote: > diff --cc lib/test_kasan.c > index 785e724ce0d8,bf9225002a7e.. > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@@ -78,33 -83,30 +83,35 @@@ static void kasan_test_exit(struct kuni >* fields, it can reorder or op

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

2020-12-03 Thread Catalin Marinas
On Thu, Dec 03, 2020 at 07:06:01PM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/include/asm/uaccess.h > index d841a560fae7,abb31aa1f8ca.. > --- a/arch/arm64/include/asm/uaccess.h > +++ b/arch/arm64/include/asm/uaccess.h > @@@ -186,64 -159,20 +159,43 @@@ static inline void __uac

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

2020-10-13 Thread Stephen Rothwell
Hi all, On Mon, 21 Sep 2020 18:03:53 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/arm64/mm/mmu.c > > between commit: > > 0178dc761368 ("arm64: mte: Use Normal Tagged attributes for the linear map") > > from the arm64 tre

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

2020-09-21 Thread Catalin Marinas
On Mon, Sep 21, 2020 at 06:03:53PM +1000, Stephen Rothwell wrote: > diff --cc arch/arm64/mm/mmu.c > index 087a844b4d26,64211436629d.. > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp > #endif > >

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

2020-07-16 Thread Will Deacon
On Thu, Jul 16, 2020 at 06:00:12PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/arm64/mm/init.c > > between commit: > > abb7962adc80 ("arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K > and 64K configs") > > from t

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

2018-12-13 Thread Will Deacon
On Thu, Dec 13, 2018 at 05:01:07PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/arm64/mm/mmu.c > > between commit: > > 4ab215061554 ("arm64: Add memory hotplug support") > > from the arm64 tree and commit: > >

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

2018-12-11 Thread Will Deacon
On Tue, Dec 11, 2018 at 05:12:30PM +1100, Stephen Rothwell wrote: > On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > arch/arm64/mm/proc.S > > > > between commits: > > > > 67e7fdfcc682 ("arm64:

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

2018-12-10 Thread Stephen Rothwell
Hi all, [Sent to early with people missing ...] On Tue, 11 Dec 2018 17:11:02 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/arm64/mm/proc.S > > between commits: > > 67e7fdfcc682 ("arm64: mm: introduce 52-bit userspace suppo

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

2018-09-24 Thread Catalin Marinas
Hi Stephen, On Mon, Sep 24, 2018 at 02:38:53PM +1000, Stephen Rothwell wrote: > diff --cc arch/arm64/Kconfig > index da5e6f085561,f8a618a292f4.. > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@@ -785,7 -786,8 +785,8 @@@ config ARCH_FLATMEM_ENABL > def_bool !NUMA > >

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

2018-08-15 Thread Stephen Rothwell
Hi all, On Fri, 27 Jul 2018 20:55:32 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/firmware/efi/libstub/Makefile > > between commit: > > 0b3e336601b8 ("arm64: Add support for STACKLEAK gcc plugin") > > from the arm64 tr

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

2015-12-16 Thread Will Deacon
On Wed, Dec 16, 2015 at 04:01:43PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/memblock.h > > between commit: > > bf3d3cc580f9 ("mm/memblock: add MEMBLOCK_NOMAP attribute to memblock memory > table")

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

2014-09-23 Thread Catalin Marinas
On Tue, Sep 23, 2014 at 08:23:39AM +0100, Stephen Rothwell wrote: > Today's linux-next merge of the akpm-current tree got a conflict in > arch/arm64/mm/dma-mapping.c between commit 2189064795dc ("arm64: > Implement set_arch_dma_coherent_ops() to replace bus notifiers") from > the arm64 tree and com