From patchwork Fri Jun 7 15:39:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 166159 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp800250ili; Fri, 7 Jun 2019 08:47:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+lIqbv8L5dgXxkrsBtXZ1Qg+MjmDk32lFE3MTwzSVfH9ffvoK4uA71JWz/qFsUsUfiZek X-Received: by 2002:a65:44c8:: with SMTP id g8mr3343660pgs.443.1559922421956; Fri, 07 Jun 2019 08:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922421; cv=none; d=google.com; s=arc-20160816; b=vcBNR9GG7yeXdp8dABdqmpRAwyASiVCSm+eulwmIm5H6FlUVemPUBvJlvojnFWcdFk AHreNNM+j3M9X/kEgIzPwd7VRxwTLaVpZoiLbCBa15HUhU8bJ6u9TzQTEnoYVt0ZOTh+ UEDHZ9cebpQHLusnTweX8gDmp5e85xVmEsAckvPTIT0BkV0vAAb0AYG4JcrCHil4Y8JJ 7gMAKHuFTqt8fLJwTAxoEt+dEqaFFfdgpjAcUN/cbA3afexAKM71bngJZQQHWTYgvFY5 QJ4a7fBOj9VChn02za+jv9Ak9jwCSLC20pCcTlW5Tr9bawnLlZd8gZxiP9fuZz02H6TQ n9Xw== 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=L0fZTxjPy3dgRvqZgUZplH5meOBUcy+o2scTtbAYXbA6Ap3ATSt3nv5nnPwSO2a63b G3FkrLubnimkbF5LYih+OaK45omqXIkKorFAZDrQjgZOBenGv7xQT8mdjJk4roEiTn8t oZcifkjHiBiGN0mVLjANcUymbTVeNg3pxUWnvAN4gDfb19YRut/BrhQTMziRJF9U+BAJ d2EYv7a+je16InyIUa1IdxXrb+WEcGCpxXbFTNMH3TA8caM3WZFPsEO6ziFcIWH0VzMs HFsBQItrGUkLJazS2Y8rkEG1mVk67UNlDjcGx9q+rn0Fn2BCqpm6XYDInOHbVcPk43Pv PriA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HDeyLA+G; 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 q20si2087866pjp.24.2019.06.07.08.47.01; Fri, 07 Jun 2019 08:47:01 -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; dkim=pass header.i=@kernel.org header.s=default header.b=HDeyLA+G; 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 S1731499AbfFGPrA (ORCPT + 30 others); Fri, 7 Jun 2019 11:47:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:59538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730977AbfFGPq5 (ORCPT ); Fri, 7 Jun 2019 11:46:57 -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 EB2C32147A; Fri, 7 Jun 2019 15:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922416; bh=y1bzMfbqPphPMtnUPCsYu7EnJPvPqvUKBEnwiVmJSs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDeyLA+GsuvZKcJ8Rc8HGuo2pJ3tNHxtVwdFHo4+m2KyZL2u0UkFtupkCPqPcBTRE l11SufsP99wA/jaDI+J8asbNLiGoHku4SAb0I7MW2BaPeTVjWNHMOXSwDxFebsAiik wdxh0NAyrHxGA+OuVY4vj3NsLswAN7vtW93jaZrw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 4.19 43/73] docs: Fix conf.py for Sphinx 2.0 Date: Fri, 7 Jun 2019 17:39:30 +0200 Message-Id: <20190607153853.966681426@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.669070800@linuxfoundation.org> References: <20190607153848.669070800@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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")