From patchwork Sun Jun 9 16:42:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 166234 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp57008ilk; Sun, 9 Jun 2019 09:53:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1gxQgl/dREWb++SOd26z92I5+PDIOXMWm1n/uniSzVCbedoc5aRxuaeJYrXEzwrVKJllk X-Received: by 2002:a62:e0c2:: with SMTP id d63mr13399723pfm.60.1560099203083; Sun, 09 Jun 2019 09:53:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560099203; cv=none; d=google.com; s=arc-20160816; b=K38yRan6WLLCRsuow/MinqKb6oucI4VjSM4t5cq+WWn5Nx3YYkIfsI8iiwa1L6hajR 8SV5tIaa9RIY4kswByjdvLD6tm5Ms6uugsQX3oHbMoiQjmiRDD+kDed9R8YLM6PgYMo4 NKH4vvwmYuogvCDujr+azaWCsZihJGhNY7TdPih+vl2KuwS2tpjhxH6ft3eoNzw37he/ tPoAUD+TlrB6pd8I+ad++ssnJIyOcE+mo8lhDtYGw//Ag3YcIkKXjsCLj/WGYX0NI0DI pguwI1qMUFvoKPVQ4AH2PvgYzZUwU+ufTJP9gvhS9e6XcF55brfW3dBOyWSajwRVYCel eKeQ== 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=2WkLi9RHXRlXiPjSwPAgJuGG1n2ovPQ+dDTyaHvQREs=; b=fYJtcqax0up2l1oa48bGD4MF1Kh48QhkdVArbDx3ipr7B29GtMmUWFbOzhpUDzGmr5 Xx9TYFeQHZo0BF8Cmwpmjy86aAKZ1UGQS4JHE/ZWAjlx/AYm1PPe0YfTwjKWBnwwLE9I LA1IR1ybzjNs/4ErZV4TiZQjgmNKQXS9JDgX1SiU3633B8JkdxiVBtzMAJ4Tx2+8aMFE cs5SHMobEp1u4d82yVuG+5flUBX1bcQWGRdPs87V/p3AUK3y8YwleDazDqthlAuFwfAU 0ai9+ybNDZclsu2WvnUedqoJbtRUETWF33hSeMVZW/0NL9Rhzufnjpz3MvGEPx3YQcPW jkKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w98sDvUm; 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 b38si4444147pla.137.2019.06.09.09.53.22; Sun, 09 Jun 2019 09:53:23 -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=w98sDvUm; 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 S1732382AbfFIQxV (ORCPT + 30 others); Sun, 9 Jun 2019 12:53:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:54476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732369AbfFIQxR (ORCPT ); Sun, 9 Jun 2019 12:53:17 -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 95E212081C; Sun, 9 Jun 2019 16:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099197; bh=MpYDlxEzM89J10j2FWR/9KD66j1za1YxxQWzRSi1PHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w98sDvUm8sPPYHBt+O8XVEXsOZ8u0ovh/VgyaIEkdRcqVW5EcPhI4LvuRiNIiGjEp R/qG6lz/zfqrKkKhh0BVtcKvhyaXyXU61PGePCz/Ah16KLDGcFMmirgH44PhPlyxD+ H7po4SQfvCQRAYQO6guL6v6sX/TLuT78TnxUUWfA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Corbet Subject: [PATCH 4.9 44/83] docs: Fix conf.py for Sphinx 2.0 Date: Sun, 9 Jun 2019 18:42:14 +0200 Message-Id: <20190609164131.661407633@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.843327870@linuxfoundation.org> References: <20190609164127.843327870@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 @@ 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")