Re: linux-next: manual merge of the akpm-current tree with the folio tree

Andrew Morton
2022-02-17T05:51:39Z

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?