Hi Vasily,

On Tue, 26 Oct 2021 16:05:55 +0200 Vasily Gorbik <gor@linux.ibm.com> wrote:
>
> updating s390 tree for linux-next today I hit a merge conflict with
> akpm-current/current. Please find conflict resolution below.

Thanks for the heads up and merge resolution.

-- 
Cheers,
Stephen Rothwell