projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
72b97d0
)
sphinx: conf.py: properly handle Sphinx 4.0
author
Mauro Carvalho Chehab
<mchehab+huawei@kernel.org>
Tue, 27 Oct 2020 09:51:06 +0000
(10:51 +0100)
committer
Jonathan Corbet
<corbet@lwn.net>
Wed, 28 Oct 2020 17:26:10 +0000
(11:26 -0600)
One of the checks for Sphinx 3+ is broken, causing some
C warnings to return back with Sphinx 4.0.x.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link:
https://lore.kernel.org/r/d5abc30056dafeec0778a46263a45401bdc7f11e.1603791716.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Documentation/conf.py
patch
|
blob
|
history
diff --git
a/Documentation/conf.py
b/Documentation/conf.py
index 376dd0ddf39cdcc89d1ea37d49b299f1ed154c7a..7ee05fd4cb17640def6ea30889b36b32e8995101 100644
(file)
--- a/
Documentation/conf.py
+++ b/
Documentation/conf.py
@@
-50,7
+50,7
@@
if major >= 3:
support for Sphinx v3.0 and above is brand new. Be prepared for
possible issues in the generated output.
''')
- if
minor > 0 or patch >= 2
:
+ if
(major > 3) or (minor > 0 or patch >= 2)
:
# Sphinx c function parser is more pedantic with regards to type
# checking. Due to that, having macros at c:function cause problems.
# Those needed to be scaped by using c_id_attributes[] array