From: Matthew Wilcox <willy@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: Folio tree for next
Date: Tue, 20 Jul 2021 03:55:44 +0100 [thread overview]
Message-ID: <YPY7MPs1zcBClw79@casper.infradead.org> (raw)
In-Reply-To: <20210720094033.46b34168@canb.auug.org.au>
On Tue, Jul 20, 2021 at 09:40:33AM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> On Sun, 18 Jul 2021 20:57:58 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > On Mon, 19 Jul 2021 04:18:19 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > > Please include a new tree in linux-next:
> > >
> > > https://git.infradead.org/users/willy/pagecache.git/shortlog/refs/heads/for-next
> > > aka
> > > git://git.infradead.org/users/willy/pagecache.git for-next
> > >
> > > There are some minor conflicts with mmotm. I resolved some of them by
> > > pulling in three patches from mmotm and rebasing on top of them.
> > > These conflicts (or near-misses) still remain, and I'm showing my
> > > resolution:
> >
> > I'm thinking that it would be better if I were to base all of the -mm
> > MM patches on linux-next. Otherwise Stephen is going to have a pretty
> > miserable two months...
>
> If they are only minor conflicts, then please leave them to me (and
> Linus). That way if Linus decides not to take the folio tree or the
> mmotm changes (or they get radically changed), then they are not
> contaminated by each other ... hints (or example resolutions) are
> always welcome.
I think conceptually, the folio for-next tree is part of mmotm for this
cycle. I would have asked Andrew to carry these patches, but there are
people (eg Dave Howells) who want to develop against them. And that's
hard to do with patches that are in mmotm.
So if Andrew bases mmotm on the folio tree for this cycle, does that
make sense?
next prev parent reply other threads:[~2021-07-20 2:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 3:18 Folio tree for next Matthew Wilcox
2021-07-19 3:57 ` Andrew Morton
2021-07-19 23:40 ` Stephen Rothwell
2021-07-19 23:51 ` Stephen Rothwell
2021-07-20 2:55 ` Matthew Wilcox [this message]
2021-07-21 2:21 ` Stephen Rothwell
2021-07-21 2:29 ` Andrew Morton
2021-07-21 2:46 ` Matthew Wilcox
2021-07-21 3:22 ` Andrew Morton
2021-07-21 3:22 ` Matthew Wilcox
2021-07-21 5:04 ` 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=YPY7MPs1zcBClw79@casper.infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.