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

[Andrew Morton]

On Mon, 8 Oct 2018 08:32:28 -0600 Jonathan Corbet <corbet@xxxxxxx> wrote:

> On Mon, 8 Oct 2018 10:38:29 +0200
> David Hildenbrand <david@xxxxxxxxxx> 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.

Gee.  Case-by-case, I guess.  A lot of these changes are three-line
alterations as part of a larger patch which necessitated that
alteration.