From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Matthew Wilcox <willy@infradead•org>
Cc: 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 mm tree with the folio tree
Date: Mon, 20 Jun 2022 13:53:43 +1000 [thread overview]
Message-ID: <20220620135343.52f96bee@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
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);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-06-20 3:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 3:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-06-22 5:38 linux-next: manual merge of the mm tree with the folio tree Stephen Rothwell
2022-06-22 7:22 ` Muchun Song
2022-06-22 18:59 ` Andrew Morton
2022-06-23 2:15 ` Muchun Song
2022-05-12 8:26 Stephen Rothwell
2022-05-12 11:52 ` Ryusuke Konishi
2022-05-12 12:51 ` Matthew Wilcox
2022-05-12 16:13 ` Ryusuke Konishi
2022-05-03 6:14 Stephen Rothwell
2022-05-02 9:36 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220620135343.52f96bee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox