summaryrefslogtreecommitdiffstats
path: root/Documentation/conf.py
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2020-10-28 11:42:55 -0600
committerJonathan Corbet <corbet@lwn.net>2020-10-28 11:42:55 -0600
commit6fee9372e0af63f557ad234663d8248f3caefc37 (patch)
tree1f3ab8d7009d54badbad1b17dfd31794ae500750 /Documentation/conf.py
parente051955977b7e26124aa8c8398278145f85f94e8 (diff)
parentafc74ce7b484da5c5698d8eb2472a58c547cbc2b (diff)
downloadlinux-6fee9372e0af63f557ad234663d8248f3caefc37.tar.gz
linux-6fee9372e0af63f557ad234663d8248f3caefc37.tar.xz
Merge branch 'mauro-warnings' into docs-next
Mauro says: This series contain the patches from a previous series I sent: [PATCH v2 00/24] Documentation build fixes against next-20201013 Plus other patches I sent later, against other versions of linux-next between 20201013 and v5.10-rc1. It fixes most of the remaining documentation build warnings. There were some changes from v2, as I changed some patches due to the feedback received, and added reviewed-by/acked-by to several of them. After this series, there will be just 3 warnings at include/kunit/test.h, whose fixes were already applied by Shuah via her tree at linux-next. Hopefully, she will be sending it upstream anytime toon. So, I dropped the fix from my trees. The vast majority of patches here are also on my linux-next tree, as my original plan were to send them upstream by the end of the merge window. I'll drop from it once they get merged. As those patches are fixes, I guess it should be ok to get them merged for -rc2 or -rc3. [jc: removed DRM and JBD patches applied elsewhere]
Diffstat (limited to 'Documentation/conf.py')
-rw-r--r--Documentation/conf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 376dd0ddf39c..7ee05fd4cb17 100644
--- 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