linux-next: manual merge of the folio tree with the maple tree

From: broonie@kernel.org
To: Matthew Wilcox <willy@infradead.org>
Cc: Hugh Dickins <hughd@google.com>,
	"Liam R . Howlett" <Liam.Howlett@oracle.com>,
	"Liam R . Howlett" <Liam.Howlett@Oracle.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the folio tree with the maple tree
Date: Wed, 23 Feb 2022 23:54:22 +0000	[thread overview]
Message-ID: <20220223235422.672736-1-broonie@kernel.org> (raw)

Hi all,

Today's linux-next merge of the folio tree got a conflict in:

  mm/oom_kill.c

between commit:

  91a14015304fe ("mm/oom_kill: Use maple tree iterators instead of vma linked list")

from the maple tree and commit:

  a213e5cf71cbc ("mm/munlock: delete munlock_vma_pages_all(), allow oomreap")

from the folio 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.

diff --cc mm/oom_kill.c
index 0e7effe225e59,6b875acabd1e7..0000000000000

--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@@ -555,8 -525,8 +555,8 @@@ bool __oom_reap_task_mm(struct mm_struc
  	 */
  	set_bit(MMF_UNSTABLE, &mm->flags);
  
 -	for (vma = mm->mmap ; vma; vma = vma->vm_next) {
 +	for_each_vma(vmi, vma) {
- 		if (!can_madv_lru_vma(vma))
+ 		if (vma->vm_flags & (VM_HUGETLB|VM_PFNMAP))
  			continue;
  
  		/*
