From patchwork Wed May 22 20:50:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 164898 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1328429ili; Wed, 22 May 2019 13:51:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxKbf3qSDiVU69HLOsS970wkzRuCFFOtHmBGFcYFTqyazSSERE97tkT5PKPqeen1V2uLIKI X-Received: by 2002:a17:902:424:: with SMTP id 33mr92951644ple.102.1558558278071; Wed, 22 May 2019 13:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558558278; cv=none; d=google.com; s=arc-20160816; b=rgnSZi9x1QTQZXBM7BN2fN+UcYUNm7+MNvRBI4TIFmG5wPygoLoTMUc64FUA6jmJZM c4IIfYkH5fpAAM3S3wjlOKwQOac6Z9Ug5Gs/7qgVdlKkQcQlVPcOF8tfrE6tS3dpjyvd ak5+DqOh16znd6jck2Jq+2fCb2eUKmICQV9v6Bzdjkzfz5MywsIYCnLpVpahDLHxwyGi T5x1OGTnjpNzdNbn3TBIj/FqPkrSGVEq2GJ9AM7s30gTwi7JEQPYKSq3lVp37FNPUmrN mseNc/KCDhefIj0Zu35zhLuNWazmR5ATxqSR2nzVDt9RgWvGm7dKliVtK3mWYi2lKCPe CdGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=40IsZ2QSF57jokoQgnLowe8JybRRidr3M86Y3Kub/n0=; b=O42zl8WFZJyI05Gi3/APCKF5AdkzQOMyw1YDfjiMFy0fQnMXY+NzjAKhsWfAIhTwLw t/pjvQsEb0PudZycqTSvCVJsyH8iiE+qJI5EvegZq0ozqTc7X+xeiKQRzFHlv6ikTp02 5wbagvv3V5aAY6jggS3f1iA1Yum9b5MED5GgcWqKTvsH1KzGbklR9yJ4jlfovUsQDgTD JeCP4Uyn2NBKiGxY8RV7VX69XeE93Zk/NE+39Qgtj4PD+jZidBnBjuOXJv1gG2aHnIYP 8BOe7JFQPNaxqtxWlyiTUZokwaW5tcdthhrdGr/Z3qU2AlMxjFNrWOV7WpH4aBZn7HFH 4+kQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si28220476pga.385.2019.05.22.13.51.17; Wed, 22 May 2019 13:51:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730458AbfEVUvQ (ORCPT + 30 others); Wed, 22 May 2019 16:51:16 -0400 Received: from ms.lwn.net ([45.79.88.28]:49388 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730327AbfEVUu7 (ORCPT ); Wed, 22 May 2019 16:50:59 -0400 Received: from meer.lwn.net (localhost [127.0.0.1]) by ms.lwn.net (Postfix) with ESMTPA id 292AD1427; Wed, 22 May 2019 20:50:59 +0000 (UTC) From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jani Nikula , Markus Heiser , Mauro Carvalho Chehab , Oleksandr Natalenko , Jonathan Corbet Subject: [PATCH 7/8] docs: Fix conf.py for Sphinx 2.0 Date: Wed, 22 May 2019 14:50:33 -0600 Message-Id: <20190522205034.25724-8-corbet@lwn.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190522205034.25724-1-corbet@lwn.net> References: <20190522205034.25724-1-corbet@lwn.net> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Jonathan Corbet --- Documentation/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 diff --git a/Documentation/conf.py b/Documentation/conf.py index 72647a38b5c2..7ace3f8852bd 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -37,7 +37,7 @@ needs_sphinx = '1.3' extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', 'kfigure', 'sphinx.ext.ifconfig'] # 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")