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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 28 Jan 2021 19:08:43 +1100

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 can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/filemap.c
index 4d0b7a122850,4417fd15d633..000000000000
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@@ -42,7 -42,7 +42,8 @@@
  #include <linux/psi.h>
  #include <linux/ramfs.h>
  #include <linux/page_idle.h>
 +#include <asm/pgalloc.h>
+ #include <linux/secretmem.h>
  #include "internal.h"
  
  #define CREATE_TRACE_POINTS