From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 30 Nov 2020 12:16:11 +0000 (-0500)
Subject: docs: temporarily disable the kernel-doc extension
X-Git-Tag: v6.0.0-rc0~189^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f79248b53bee83bb8e69c8b2e9d70d6d28039987;p=thirdparty%2Fqemu.git

docs: temporarily disable the kernel-doc extension

Preserve bisectability while we update scripts/kernel-doc from Linux.
Without this patch, building with Sphinx 3 would break while we
revert our own Sphinx 3 support and replace it with Linux's.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/docs/sphinx/kerneldoc.py b/docs/sphinx/kerneldoc.py
index 3ac277d1622..9124fcbff1b 100644
--- a/docs/sphinx/kerneldoc.py
+++ b/docs/sphinx/kerneldoc.py
@@ -75,6 +75,9 @@ class KernelDocDirective(Directive):
         # Tell sphinx of the dependency
         env.note_dependency(os.path.abspath(filename))
 
+        # Disabled temporarily while scripts/kernel-doc is updated
+        return []
+
         tab_width = self.options.get('tab-width', self.state.document.settings.tab_width)
 
         # FIXME: make this nicer and more robust against errors