From patchwork Fri Jun 7 15:39:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 166164 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp803098ili; Fri, 7 Jun 2019 08:49:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1II7LIfS1xyizOA+CUVEGQfpH6AcYpPYbH8IBImF4tT0snG5UjZHuNLMrEHeNJuxNDYKW X-Received: by 2002:aa7:90d3:: with SMTP id k19mr57734707pfk.1.1559922561341; Fri, 07 Jun 2019 08:49:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922561; cv=none; d=google.com; s=arc-20160816; b=G4944d+mKmeamrnDaH1Amk1Jc1ko+sv3I5NLj6KcWkCjyxsnupRS7SD/0k9L5lRFbS e7X/z9MvteIm8N9fDcSVHXGLcN6X+gOLsO1nWg55PMwYcl9yPDPq7beeBFT0BQUglfya WyCg9EbAw7j3shbg3jjZVGTLxyJPTajCIBkx5FDufSwBsBTRcSDncwN6ui0rr48u+SOZ bj8tlzOZuuW4MxYYyfOgWaiZ+SCYD6Ys16lYMO5HDxmgN4QVqiv3d8fR/uzCHt2/oPXj FuwBeRV4FaNVePd2VKtk4CwpAgmc4jj2VsWgSIKCIPAX5dwlA8buED9QrcyJYe3fpw/a D9/g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q4POIVw54Yt+r2qDNxjtcpiHjGCUXPhPqj7d2pRGGOQ=; b=0mCzmAjl6Xc7Om48yGeVbUwz3PAbeJqJTchStJlcioDpaxiQWeUKetllHyKcDEhNaU QAxqd2Pn4PhoRpUuNIUbNwS64Ea96E/B4WRjDryLjqDeaL5jrcio9DFKe4Vrh/IFuzj8 tQyHN2jdDKit69wEyGA0stapBILNMhDPnxQ5bR9ZHwrl9xDqB9APCRBVc/dWFA2jlXTZ bRrwZzWjzf9YN4fGjVFx6uyp3R7Lw9Qe4JN2O8OLx1kVUkZdwwUL7JpoE9jcKm4mskO5 ZrplqkbX0dQdOkY9L1mQ+wdQ44liXYu8Amvrpl7RA07CkqWPrrP5Flttz6HJV0uk/fef U3yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GCfFWAOz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 v9si2074187pgs.312.2019.06.07.08.49.21; Fri, 07 Jun 2019 08:49:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GCfFWAOz; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731930AbfFGPtU (ORCPT + 14 others); Fri, 7 Jun 2019 11:49:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:35178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731919AbfFGPtT (ORCPT ); Fri, 7 Jun 2019 11:49:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DDF8F214C6; Fri, 7 Jun 2019 15:49:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922559; bh=y1bzMfbqPphPMtnUPCsYu7EnJPvPqvUKBEnwiVmJSs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GCfFWAOzVm5F5dBuflX1QK+o0T48hzHS5grzTSmfFDFrSlBDfMYbuioDO/WhpCAJK r+lEpLTXvQbY2VCH34imxnkKkcFY1GHjjN2r7+L2wZOLQehg27cB7CpqwuqvIuJ3tU uIS7luxljI1WjwCTtwUPHeWDMDeDswct3pLKR4r4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 5.1 55/85] docs: Fix conf.py for Sphinx 2.0 Date: Fri, 7 Jun 2019 17:39:40 +0200 Message-Id: <20190607153855.621855313@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153849.101321647@linuxfoundation.org> References: <20190607153849.101321647@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Corbet 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 Signed-off-by: Greg Kroah-Hartman --- Documentation/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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")