From: Matthew Wilcox <willy@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the folio tree
Date: Tue, 15 Feb 2022 13:12:05 +0000 [thread overview]
Message-ID: <YgumpQrC+cuYe91H@casper.infradead.org> (raw)
In-Reply-To: <20220215180043.23879691@canb.auug.org.au>
On Tue, Feb 15, 2022 at 06:00:43PM +1100, Stephen Rothwell wrote:
> 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.
Thanks!
My plan is to take v2 of Hugh's mlock rewrite into my tree today and
redo the folio changes on top of those. That should reduce the amount
of conflict between akpm's tree and the folio tree to the usual
managable amount. Let's see how that goes.
next prev parent reply other threads:[~2022-02-15 13:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 7:00 linux-next: manual merge of the akpm-current tree with the folio tree Stephen Rothwell
2022-02-15 13:12 ` Matthew Wilcox [this message]
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=YgumpQrC+cuYe91H@casper.infradead.org \
--to=willy@infradead$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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