From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
LKML <linux-kernel@vger.kernel.org>,
linux-doc@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [GIT PULL] Documentation for 5.10
Date: Tue, 13 Oct 2020 10:49:50 +0200 [thread overview]
Message-ID: <20201013104950.25764be1@coco.lan> (raw)
In-Reply-To: <20201012133042.688ee6a6@lwn.net>
Hi Linus,
Em Mon, 12 Oct 2020 13:30:42 -0600
Jonathan Corbet <corbet@lwn.net> escreveu:
> As hoped, things calmed down for docs this cycle; fewer changes and almost
> no conflicts at all. This pull includes:
>
> - A reworked and expanded user-mode Linux document
> - Some simplifications and improvements for submitting-patches.rst
> - An emergency fix for (some) problems with Sphinx 3.x
> - Some welcome automarkup improvements to automatically generate
> cross-references to struct definitions and other documents
> - The usual collection of translation updates, typo fixes, etc.
>
> NOTE that there will be a largish late-window pull request coming,
> probably directly from Mauro. Sphinx 3.x has broken a bunch of things,
> which is obnoxious, though the end result is better; fixing the problems
> requires a number of cross-tree documentation tweaks. These are best done
> toward the end to avoid creating unnecessary conflicts with other trees.
I double-checked: after having both docs and media tree pulled upstream,
80% of the patches should apply cleanly.
So, I just merged the ones that apply cleanly at my -next tree:
https://git.linuxtv.org/mchehab/media-next.git/ (master branch)
If everything goes well on tomorrow's next, I'll send you a pull request
with those.
The other ones depend on merges from DRM, hwmon and other
trees. So, I'll keep rebasing them and should be sending you a late
PR by the end of the merge window, fixing the remaining doc issues.
We're aiming to have zero documentation warnings by
the end of the merge window, when built with Sphinx 2.x,
and just a handful set of warnings with Sphinx 3.1+[1].
[1] One of the limitations of Sphinx C cross-reference code,
up to its latest version, is that it doesn't allow to have
both a function called "foo" and a struct or enum also called
"foo".
With Sphinx < 3, this doesn't generate warnings, but it still
cause troubles with cross-references. Sphinx 3.x warns
about name clashes, but the bug was not solved yet upstream.
They're working on Sphinx to fix that in the future:
https://github.com/sphinx-doc/sphinx/issues/8241
https://github.com/sphinx-doc/sphinx/issues/7819
Thanks,
Mauro
next prev parent reply other threads:[~2020-10-13 8:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 19:30 [GIT PULL] Documentation for 5.10 Jonathan Corbet
2020-10-12 23:50 ` pr-tracker-bot
2020-10-13 8:49 ` Mauro Carvalho Chehab [this message]
2020-10-13 9:58 ` Stephen Rothwell
2020-10-13 10:21 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201013104950.25764be1@coco.lan \
--to=mchehab+huawei@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).