From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Matthew Wilcox <willy@infradead.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: Wed, 16 Feb 2022 21:51:24 -0800 [thread overview]
Message-ID: <20220216215124.169c42a52e31575cedc4dea5@linux-foundation.org> (raw)
In-Reply-To: <20220217163026.5e48ccb1@canb.auug.org.au>
On Thu, 17 Feb 2022 16:30:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Matthew,
>
> On Wed, 16 Feb 2022 20:41:35 +0000 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > So where do we go from here? I can see ways of resolving this if
> > Andrew switches to git, but he won't, so that's out. Perhaps I can
> > publish a git tree of Hugh's mlock patches and Christoph's series,
> > and you can pull that before Andrew's tree so git resolves the conflicts
> > early before trying to resolve conflicts against my tree?
>
> My response for any other subsystem would be that you need to go
> through the maintainer's tree. In this case that means feeding a patch
> series to Andrew and updating that patch series.
>
> Alternatively, you need to find someone (with Andrew's agreement) who
> can maintain a git tree that includes all Andrew's MM patches and any
> other topic branches and deals with all the conflicts and can feed it
> all to Linus. Linux-next would also include that tree/branch.
>
> Andrew, do you have any comments?
Let's try Matthew's idea - I'll get Hugh's and Christoph's series via
linux-next and shall figure out the rest.
I assume mapletree will throw another spanner in the works?
next prev parent reply other threads:[~2022-02-17 5:51 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
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 [this message]
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=20220216215124.169c42a52e31575cedc4dea5@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--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).