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

[Catalin Marinas]

On Thu, Mar 05, 2020 at 04:50:46PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   arch/arm64/mm/mmu.c
> 
> between commit:
> 
>   bbd6ec605c0f ("arm64/mm: Enable memory hot remove")
> 
> from the arm64 tree and patch:
> 
>   37be0f08b1cc ("arm64/mm: implement unmap_hotplug_p4d_range")
> 
> from the akpm tree.
> 
> I fixed it up (I just dropped the latter (and its followup fix) for today)

Thanks Stephen. Anshuman integrated those fixes in his memory hotremove
series.

-- 
Catalin