Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943082AbcJ0Wlx (ORCPT ); Thu, 27 Oct 2016 18:41:53 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:51020 "EHLO s-opensource.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942955AbcJ0Wlw (ORCPT ); Thu, 27 Oct 2016 18:41:52 -0400 Date: Thu, 27 Oct 2016 20:40:56 -0200 From: Mauro Carvalho Chehab To: Jonathan Corbet Cc: Andrew Morton , Linux Doc Mailing List , Mauro Carvalho Chehab , LKML Subject: Re: [PATCH 00/32] Create an User's manual and improve development-process book Message-ID: <20161027204056.3c31d16c@vento.lan> In-Reply-To: <20161027143607.7f877068@lwn.net> References: <20161027131733.f37c97ff7b932a1b33cde7b8@linux-foundation.org> <20161027143607.7f877068@lwn.net> Organization: Samsung X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1544 Lines: 38 Em Thu, 27 Oct 2016 14:36:07 -0600 Jonathan Corbet escreveu: > On Thu, 27 Oct 2016 13:17:33 -0700 > Andrew Morton wrote: > > > > This patch series continues the efforts of converting the Linux Kernel > > > documentation to Sphinx. > > > > hm, renaming Documentation/kernel-parameters.txt in linux-next is going > > to be a pain for the next two months. I have one large patch series > > which alters that file and I expect more will come. > > That's going to be a continuing hassle as we try to bring a bit of order > to Documentation/, especially as so much stuff doesn't go through the docs > tree. Hopefully this cycle will be done with the most obnoxious moves, > anyway. Perhaps you could use git filter to handle it, with something like (untested): $ git filter-branch -f --tree-filter 'for i in $(git grep -l kernel-parameters.txt); do sed s,Documentation/kernel-parameters.txt,Documentation/admin-guide/kernel-parameters.rst,g $i >a && mv a $i; done' some_origin_branch.. > > I guess I can cope with that, by staging these patch series after > > linux-next but that means that I would very much like this patch series > > of your to be merged *early* after the 4.9 release, please. > > I've been making a point of getting stuff merged early (for reasons very > similar to this) for the last few cycles; will do so again. > > Alternatively, if you want to pass those particular patches thisaway, I > can do the merge and carry them with the rest. > > jon Thanks, Mauro