Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1421647 > unrolled thread

Re: [PATCH v2 00/38] Documentation/sphinx

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: [PATCH v2 00/38] Documentation/sphinx Daniel Vetter <daniel.vetter@ffwll.ch> - 2016-06-14 10:20 +0200
    Re: [PATCH v2 00/38] Documentation/sphinx Jonathan Corbet <corbet@lwn.net> - 2016-06-14 21:30 +0200

#1421647 — Re: [PATCH v2 00/38] Documentation/sphinx

Hi Jon,

On Fri, Jun 10, 2016 at 10:41 PM, Dave Airlie <airlied@gmail.com> wrote:
> On 11 June 2016 at 04:17, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> On Thu, Jun 9, 2016 at 9:55 PM, Jonathan Corbet <corbet@lwn.net> wrote:
>>> On Sat,  4 Jun 2016 14:37:01 +0300
>>> Jani Nikula <jani.nikula@intel.com> 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?
>
> It would be best if Jon can give us a known tag that won't get rebased,
> and will end up in docs-next and drm-next, then we can arranage for docs-next
> to get merged early and drm-next should be less trouble.
>
> I'm happy to merge that stable branch via drm-misc.

Ping for tag/pull request. Note that for gpu.tmpl->rst conversion we
only need what's currently in docs-next - you can merge Jani's
follow-up series at leasure later on.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

[toc] | [next] | [standalone]

#1422249

On Tue, 14 Jun 2016 10:15:00 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> Hi Jon,
> 
> On Fri, Jun 10, 2016 at 10:41 PM, Dave Airlie <airlied@gmail.com> wrote:
> 
> > It would be best if Jon can give us a known tag that won't get rebased,
> > and will end up in docs-next and drm-next, then we can arranage for docs-next
> > to get merged early and drm-next should be less trouble.
> >
> > I'm happy to merge that stable branch via drm-misc.  
> 
> Ping for tag/pull request. Note that for gpu.tmpl->rst conversion we
> only need what's currently in docs-next - you can merge Jani's
> follow-up series at leasure later on.

docs-next as a whole won't be rebased.  But, in any case, I've added a
sphinx-4.8 tag at the current spot, hope that helps.

I can promise to have my pull request ready at the beginning of the merge
window so there shouldn't be trouble with DRM having to wait on it.

Thanks,

jon

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web