Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp3656568imm; Mon, 8 Oct 2018 07:32:54 -0700 (PDT) X-Google-Smtp-Source: ACcGV62GocOgFufTzrl597ofE+TO/VT87pyRcrp4DeQFqDlpsJSLlMtEw8mu5STtqgwaLzo6s4RE X-Received: by 2002:a63:9a42:: with SMTP id e2-v6mr21613024pgo.340.1539009174010; Mon, 08 Oct 2018 07:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539009173; cv=none; d=google.com; s=arc-20160816; b=Ek8YrHKZAHQr7+v+x97GOdFtpfTRt9xiHjtoM24O+BK3s5102a43TvJF1suBxG0vE9 Bax4/Nx7ao+Vn904lwNGyuN83uSZni1Mt3Zrk1xpmx1cRsmQMFDbqrAJ1Cc5xtnfPvuK 80yWdeQlSMozp/QPxY0lg133e2KUPMafjIPVKXNodmvAnrbRo6GalMteUwqojhqB++se Ro1uAmlLAmpnoI+oFG1bE3+qCrNsaeBaDVWmRhgLXdYmDLfJTJMv/jpWJ3Lo6gNMb2eR +jv8Izp8A2ntyClHcxfZTe4hhp6GblTuLjp5RCQaNhN8ti7sjwpj8G5XV8a7AWj6+UoL oxpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=u7NS8OjoNn8Cq1SjZQPOKx8aZwpVybP9XTT/OBx445M=; b=yC+JPZGhsToFpbfjbNDIRM5jgYSqhkhLevCc9Btwmbm1mrrP5E3NL4dO6Wcqrk1mYa ltoKWDexG/Vbf4O6xp7OGcGS6BktxOhZv2zljRMtwrCJhF1Eq3MxoonSlp/yNw/e6OWz SA6x+faSR2DGC/+32JER9Vhp4oiUQ6TAWjAk+Rl8OdXJf1lGyiei8Dx/gZg4jWFuqt1r QKuTUCLneIlmOsHOAE9RejR7R7LtoQVoJaf8vmpvJadfU4Gx+r4Q+/hNTzLNz7iXO5xQ r+Uw4SrfuAa8KbYPGPIFzNxjFJBPetAIpFIEqwalkbDrQ1NF8+A+6SrRan/wUgLmsiGw e7mQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r15-v6si19006600pfj.68.2018.10.08.07.32.39; Mon, 08 Oct 2018 07:32:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726439AbeJHVob (ORCPT + 99 others); Mon, 8 Oct 2018 17:44:31 -0400 Received: from ms.lwn.net ([45.79.88.28]:41264 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726078AbeJHVob (ORCPT ); Mon, 8 Oct 2018 17:44:31 -0400 Received: from lwn.net (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id D8BB76EC; Mon, 8 Oct 2018 14:32:29 +0000 (UTC) Date: Mon, 8 Oct 2018 08:32:28 -0600 From: Jonathan Corbet To: David Hildenbrand Cc: Mike Rapoport , Stephen Rothwell , Andrew Morton , Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the akpm tree with the jc_docs tree Message-ID: <20181008083228.33ec7c1d@lwn.net> In-Reply-To: <6ab76538-b836-3b22-cb29-102c613091cf@redhat.com> References: <20181008183840.70ebfe94@canb.auug.org.au> <20181008081315.GB6772@rapoport-lnx> <6ab76538-b836-3b22-cb29-102c613091cf@redhat.com> Organization: LWN.net MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 8 Oct 2018 10:38:29 +0200 David Hildenbrand wrote: > > I can do the renaming and add the patch > > > > "memory-hotplug.txt: add some details about locking internals" > > > > on top of the jc_docs tree. > > > > Does it sound Ok? > > > > Fine with me. Works for me too. Andrew, what is your preference for mm docs patches going forward? It seems we should try to focus them on one tree or the other. My preference would be to keep carrying them to avoid conflicts elsewhere, but I can certainly direct them youward if you'd rather they went that way. Thanks, jon