Subject: linux-next: manual merge of the mm tree with the folio tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 20 Jun 2022 13:53:43 +1000

Hi all,

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

  include/linux/pagevec.h

between commit:

  132a550f50c4 ("filemap: Remove find_get_pages_range() and associated functions")

from the folio tree and commit:

  229d98bdddcb ("mm/swap: make __pagevec_lru_add static")

from the mm 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 include/linux/pagevec.h
index 6649154a2115,b0e3540f3a4c..000000000000
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@@ -26,7 -26,16 +26,6 @@@ struct pagevec 
  };
  
  void __pagevec_release(struct pagevec *pvec);
- void __pagevec_lru_add(struct pagevec *pvec);
 -unsigned pagevec_lookup_range(struct pagevec *pvec,
 -			      struct address_space *mapping,
 -			      pgoff_t *start, pgoff_t end);
 -static inline unsigned pagevec_lookup(struct pagevec *pvec,
 -				      struct address_space *mapping,
 -				      pgoff_t *start)
 -{
 -	return pagevec_lookup_range(pvec, mapping, start, (pgoff_t)-1);
 -}
 -
  unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
  		struct address_space *mapping, pgoff_t *index, pgoff_t end,
  		xa_mark_t tag);