From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.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 akpm-current tree with the folio tree
Date: Tue, 15 Feb 2022 18:00:43 +1100 [thread overview]
Message-ID: <20220215180043.23879691@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
Hi all,
Today's linux-next merge of the block tree got conflicts in:
include/linux/mm.h
include/linux/rmap.h
mm/gup.c
mm/huge_memory.c
mm/internal.h
mm/memory-failure.c
mm/migrate.c
mm/mlock.c
mm/rmap.c
mm/vmscan.c
There is no way I can figure out in a reasonable time (or at all
probably) the resolution needed here. You guys need to get together
and figure out how the folio tree changes are going to progress to
Linus' tree.
I have gone back and used the folio tree from next-20220204 again for
today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-02-15 7:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 7:00 Stephen Rothwell [this message]
2022-02-15 13:12 ` Matthew Wilcox
2022-02-16 6:21 ` Stephen Rothwell
2022-02-16 9:49 ` Stephen Rothwell
2022-02-16 20:41 ` Matthew Wilcox
2022-02-17 5:30 ` Stephen Rothwell
2022-02-17 5:51 ` Andrew Morton
2022-02-17 6:38 ` Stephen Rothwell
2022-02-17 21:19 ` Matthew Wilcox
2022-02-19 7:27 ` Christoph Hellwig
2022-02-20 0:17 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-04-08 5:18 Stephen Rothwell
2022-04-08 5:08 Stephen Rothwell
2022-03-22 8:35 Stephen Rothwell
2022-02-16 6:15 Stephen Rothwell
2021-12-10 21:17 broonie
2021-07-21 6:31 Stephen Rothwell
2021-09-06 4:48 ` Stephen Rothwell
2021-09-06 12:12 ` Matthew Wilcox
2021-09-06 16:56 ` Suren Baghdasaryan
2021-09-06 21:35 ` Stephen Rothwell
2021-09-07 13:49 ` Matthew Wilcox
2021-07-21 6:02 Stephen Rothwell
2021-09-06 4:49 ` 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=20220215180043.23879691@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®