From patchwork Sun Jun 9 16:42:17 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: 166229 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp52101ilk; Sun, 9 Jun 2019 09:46:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLBQdFjq3aUHr8arPxHlRV3VD83pIErz7AnFAlf6Ox7gpZyCpPRAtFQYAWGGhyU99Ti4Ja X-Received: by 2002:a17:90a:258b:: with SMTP id k11mr16174264pje.110.1560098807645; Sun, 09 Jun 2019 09:46:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560098807; cv=none; d=google.com; s=arc-20160816; b=DbvKncfkd+bxRq2b7RSRzTGxZ8huuwGYs8GkZMpweAOigpGdAYat5tMiYQBKpa6PJN 75yUlDxJobtutQsML554vrAlX6/2NDGIvjUmMdlbGvMGZyAO9FZr5+tzVwDTp8NkQPBY PJEqa6N62/gtc2Ae1qDAEzxIkQAcEAkJsG9ocXnhsPL4SGRHN3hvCvEoWdfHkXJhXufD EwweVjaoRaisCi7pXlh57aPQbKk1hFyMQWbZkrDPWAyXmsruseGFDNkJyMeEkyB/6VP1 2H/tLLu8gGIzyF/NhoKtSJReo9gqtPij8GCEHi3K5JBdN4cb8ZBiiUaH1PQbI6iTtAiJ XX4w== 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=uzX5+SvupaQRuaSBZdotRd0uokDRIX95PouopcHVFe0=; b=pIde3gtc6ZhYH39NCUkTvor4gCYzzlUMTznHZFubXiWjEMpWQj8zAJWInXI0vgGDOH BkrLPiKk6vEzYuumgH0y4fnNfcZkaWU79ylWzWF3EsP55EzzQVLMVT221wkOzYyTBKBK Wqa/flQdcHy4hmTBgQHIFT5ugBJUVH30JnTXzXXukPDusBNug3uK5IAUNwCHbJTSCxlz iDqFgUIXav6kf5PmE1PK5rCgS7OdwxcNsntNLGPHHuOFcpIxC/V7Pk4TIeDBa+l6Dck6 HoPTAwrwjzBTECsYXtVA3od6BlYDf07lNwk5PHhF73hw3TYnyA+E19+9hB5FtEC1E2mV bxLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QtH8pbnN; 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 v1si7938452pfv.202.2019.06.09.09.46.47; Sun, 09 Jun 2019 09:46:47 -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=QtH8pbnN; 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 S1729547AbfFIQqq (ORCPT + 14 others); Sun, 9 Jun 2019 12:46:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:45112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730609AbfFIQqp (ORCPT ); Sun, 9 Jun 2019 12:46:45 -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 316722081C; Sun, 9 Jun 2019 16:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098804; bh=gDN3Royv62WSTTTpPYuCAZqOoHLWjI5lA2MMTSlDF8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtH8pbnN6r4UIVgsXy7peffjrWToHcaiFPj9YZd/FvwsEobo1VuOErfYqG8uNUTxX YpCOy1oY7h5zWPf18VKISQPMSjIz2Tr+PYqawMM4gIr3lbvefNcrLEX2hlezO3yu6x 6wU14vpcOQmU+pSfI5z4MM15ppfYKyEccKOVolFs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jani Nikula , Jonathan Corbet Subject: [PATCH 5.1 66/70] drm/i915: Maintain consistent documentation subsection ordering Date: Sun, 9 Jun 2019 18:42:17 +0200 Message-Id: <20190609164132.953760538@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.541128197@linuxfoundation.org> References: <20190609164127.541128197@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 551bd3368a7b3cfef01edaade8970948d178d40a upstream. With Sphinx 2.0 (or prior versions with the deprecation warnings fixed) the docs build fails with: Documentation/gpu/i915.rst:403: WARNING: Title level inconsistent: Global GTT Fence Handling ~~~~~~~~~~~~~~~~~~~~~~~~~ reST markup error: Documentation/gpu/i915.rst:403: (SEVERE/4) Title level inconsistent: I "fixed" it by changing the subsections in i915.rst, but that didn't seem like the correct change. It turns out that a couple of i915 files create their own subsections in kerneldoc comments using apostrophes as the heading marker: Layout '''''' That breaks the normal subsection marker ordering, and newer Sphinx is rather more strict about enforcing that ordering. So fix the offending comments to make Sphinx happy. (This is unfortunate, in that kerneldoc comments shouldn't need to be aware of where they might be included in the heading hierarchy, but I don't see a better way around it). Cc: stable@vger.kernel.org # v4.14+ Acked-by: Jani Nikula Signed-off-by: Jonathan Corbet Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_reg.h | 6 +++--- drivers/gpu/drm/i915/intel_workarounds.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -32,7 +32,7 @@ * macros. Do **not** mass change existing definitions just to update the style. * * Layout - * '''''' + * ~~~~~~ * * Keep helper macros near the top. For example, _PIPE() and friends. * @@ -78,7 +78,7 @@ * style. Use lower case in hexadecimal values. * * Naming - * '''''' + * ~~~~~~ * * Try to name registers according to the specs. If the register name changes in * the specs from platform to another, stick to the original name. @@ -96,7 +96,7 @@ * suffix to the name. For example, ``_SKL`` or ``_GEN8``. * * Examples - * '''''''' + * ~~~~~~~~ * * (Note that the values in the example are indented using spaces instead of * TABs to avoid misalignment in generated documentation. Use TABs in the --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -37,7 +37,7 @@ * costly and simplifies things. We can revisit this in the future. * * Layout - * '''''' + * ~~~~~~ * * Keep things in this file ordered by WA type, as per the above (context, GT, * display, register whitelist, batchbuffer). Then, inside each type, keep the