From patchwork Fri Jun 7 15:39:33 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: 166154 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp794998ili; Fri, 7 Jun 2019 08:42:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqzC5DjTg9JoBIJEDgbwoRmocoN8b30Hs10REoqnESX89f25xpuuVAtR7BKrp/yD6rb8Ms0G X-Received: by 2002:a17:90a:1911:: with SMTP id 17mr6350788pjg.113.1559922146586; Fri, 07 Jun 2019 08:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922146; cv=none; d=google.com; s=arc-20160816; b=lnvMYaMm58Zcm3c4f9cXH7yQ+kFNWqfkLV0aNdP/67FF40ZufTR4PgQPOiFWFoM3NL 6bFD0mVUVmfUxrofSriC92fnn1/oGO4BAoyUcaMizRSs751EbSKQlWqpM5Zzt2jf7vj6 tROfrDwyNGAzSG18WZKIOfs3d4lESNboKLRk/Z0Suxvc9qpqZfOfrxiG21XG2XfzjUIo 3lq3NsClPYerbK2RsILIRtcTvXq0ItfJgg9KZ6yQmCYaMSBjIyLjLaaMRXHC0sXcFpgH ByE0IS+DOfq13EIPqzjz9IirfhkmARKDiLlz7FxHK/VL/6zGAdDmaXG2xNtln7ZNOHNe VR8w== 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=jWVQK34IeXQWR3CxPPcczTFGbYHXrJn54Np5TJUXoR8=; b=e15MxHdtInQwHBCl1GnjSW+ACMp/kvn6+xsBHPKZptKHOFP+T5Di1PrduR5LpM0eVt c5+St6LCzYmzomTIzQtu0vqUkc2ZK5VE/5yCKVXUtgGYCbwGAwv33bonXcLxwQAktmMd trtRZR2NHtM05KLjuzE6b1YWhZ2Nn3N1G0GXl+/I/hjnZ9tNAOUe8O8bt20UUMdCtHGM iUaQZ3FEwoK3GP31RchxiO/xwX0v5wveUMuePp7vfHqj/4dflcvV72jPlXH5ErYs+r6J 3aGbMTKoYnX8azqbl3oALvOS4IpSm0Q1oMe4SdGgpnhmdRvmik3M6F11VGqg1YNWdulT 9otA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0NUzi6cy; 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 p16si2110344pgd.370.2019.06.07.08.42.26; Fri, 07 Jun 2019 08:42:26 -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=0NUzi6cy; 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 S1730569AbfFGPmZ (ORCPT + 30 others); Fri, 7 Jun 2019 11:42:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:52958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730512AbfFGPmW (ORCPT ); Fri, 7 Jun 2019 11:42:22 -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 550E02147A; Fri, 7 Jun 2019 15:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922141; bh=K+5bd6fJvvBu5PYuyR40E8AsVzhI4d5StAL0HDet8hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0NUzi6cy39aTmd9kJoJk5xKLnhrtulT9X2CkRbJG3tPQ5JoNwEqD0p/lI9xa5po3Y CN82v3umW1pwLzfGxzn/pHBkYxmSK0wRd1/7XqX1pZc+ZmZyHg4SFw7w0uj4VyUogZ lrqbDOOBjnQW2yot6cKOE8wRkaIDBR5tOxUHsUBY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 4.14 52/69] docs: Fix conf.py for Sphinx 2.0 Date: Fri, 7 Jun 2019 17:39:33 +0200 Message-Id: <20190607153854.682187993@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@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'] # 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")