Commit 89169720 authored May 22, 2019 by Jonathan Corbet Committed by Greg Kroah-Hartman Jun 11, 2019

docs: Fix conf.py for Sphinx 2.0



commit 3bc8088464712fdcb078eefb68837ccfcc413c88 upstream.

Our version check in Documentation/conf.py never envisioned a world where
Sphinx moved beyond 1.x.  Now that the unthinkable has happened, fix our
version check to handle higher version numbers correctly.

Cc: stable@vger.kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9adcdd5c

Documentation/conf.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ from load_config import loadConfig
		extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']

		# The name of the math extension changed on Sphinx 1.4
		if major == 1 and minor > 3:
		if (major == 1 and minor > 3) or (major > 1):
		extensions.append("sphinx.ext.imgmath")
		else:
		extensions.append("sphinx.ext.pngmath")