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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20181010172123.cf95ff7f81ad86f3a1c119d3@linux-foundation.org>
Date:   Wed, 10 Oct 2018 17:21:23 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Jonathan Corbet <corbet@....net>
Cc:     David Hildenbrand <david@...hat.com>,
        Mike Rapoport <rppt@...ux.vnet.ibm.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the jc_docs tree

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

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