From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161031AbcFJSRH (ORCPT ); Fri, 10 Jun 2016 14:17:07 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:36420 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932546AbcFJSRE convert rfc822-to-8bit (ORCPT ); Fri, 10 Jun 2016 14:17:04 -0400 MIME-Version: 1.0 X-Originating-IP: [2a02:168:56b5:0:ac27:b86c:7764:9429] In-Reply-To: <20160609135523.1d027a72@lwn.net> References: <20160609135523.1d027a72@lwn.net> From: Daniel Vetter Date: Fri, 10 Jun 2016 20:17:02 +0200 Message-ID: Subject: Re: [PATCH v2 00/38] Documentation/sphinx To: Jonathan Corbet , Dave Airlie Cc: Jani Nikula , Markus Heiser , Grant Likely , Mauro Carvalho Chehab , Keith Packard , LKML , linux-doc@vger.kernel.org, Hans Verkuil Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 9, 2016 at 9:55 PM, Jonathan Corbet wrote: > On Sat, 4 Jun 2016 14:37:01 +0300 > Jani Nikula wrote: > >> When this lands in docs-next and we can backmerge to drm, we'll plunge >> ahead and convert gpu.tmpl to rst, and have that ready for v4.8. > > That is now done — thanks for running with this! I'm looking forward to > seeing where we can take it from here. > > One little thing: there's a bunch of new warnings in the htmldocs build: > > .//include/net/mac80211.h:671: warning: duplicate section name 'Description' > .//include/net/mac80211.h:3174: warning: duplicate section name 'Description' > > Some quick messing around suggests that it happens when a kerneldoc entry > has free text both above and below the parameter list; there aren't many > such places. I can send in a patch for mac80211.h to silence most of it, > but it might be nice if it worked as before without whining. Awesome, Jani's patches landed in drm-next. As discussed I'd like to merge this into drm-misc, to be able to synchronize the gpu.tmpl->rst conversion with ongoing drm work. Can I just pull your branch, or do you want me to pull a special tag? With that I can start wreaking havoc ;-) Also we need to coordinate the merge window order. I think as long as I only pull from your tree for the 4.8 cycle (there shouldn't be any conflicts in the conversion itself, as long as we only touch gpu.rst in drm-misc) that would work if drm-next lands after doc-next. Dave, would that be ok with you too? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch