From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD48DC433EF for ; Thu, 17 Feb 2022 05:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234332AbiBQFvw (ORCPT ); Thu, 17 Feb 2022 00:51:52 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:45058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229831AbiBQFvm (ORCPT ); Thu, 17 Feb 2022 00:51:42 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0895413DE7; Wed, 16 Feb 2022 21:51:28 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A3712B80D56; Thu, 17 Feb 2022 05:51:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14DDAC340E8; Thu, 17 Feb 2022 05:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1645077085; bh=DbWFlI8tR+zfxxtBr/EFeEr5eetJy4Sz7A2lzK7mrEM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=P1Y8CY/LkMU0O+62HvfFKN07FRBgmUnpGbFouLqN7Q3sCYJcHGel+Wk9gcrSrO35N RfZlaSbH1I9+XXOjVAKWGyGgby9ORPJdLQ3Ll+vcqdBg/56iSStilTpSPt6Uxu7im2 kxGBo9HGUqMp6qcgzNtf+oareAsvNxLYAu18n2Hg= Date: Wed, 16 Feb 2022 21:51:24 -0800 From: Andrew Morton To: Stephen Rothwell Cc: Matthew Wilcox , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the akpm-current tree with the folio tree Message-Id: <20220216215124.169c42a52e31575cedc4dea5@linux-foundation.org> In-Reply-To: <20220217163026.5e48ccb1@canb.auug.org.au> References: <20220215180043.23879691@canb.auug.org.au> <20220216172109.72fd0a38@canb.auug.org.au> <20220217163026.5e48ccb1@canb.auug.org.au> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 17 Feb 2022 16:30:26 +1100 Stephen Rothwell wrote: > Hi Matthew, > > On Wed, 16 Feb 2022 20:41:35 +0000 Matthew Wilcox 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?