From: Stephen Rothwell <sfr@rothwell.id.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Wilcox <willy@infradead.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 09:51:37 +1000 [thread overview]
Message-ID: <20210720095137.65702810@elm.ozlabs.ibm.com> (raw)
In-Reply-To: <20210720094033.46b34168@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]
Hi Andrew,
On Tue, 20 Jul 2021 09:40:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
Also, I prefer to have less, not more, of the mmotm patch set depending
on the rest of linux-next since fixing conflicts while rebasing is
often more pain than while merging.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-07-19 23:51 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 [this message]
2021-07-20 2:55 ` Matthew Wilcox
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=20210720095137.65702810@elm.ozlabs.ibm.com \
--to=sfr@rothwell.id.au \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).