Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1242C433EF for ; Fri, 13 May 2022 19:25:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383866AbiEMTZH (ORCPT ); Fri, 13 May 2022 15:25:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383879AbiEMTXQ (ORCPT ); Fri, 13 May 2022 15:23:16 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C8F22F3BC for ; Fri, 13 May 2022 12:22:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F32A5B8310B for ; Fri, 13 May 2022 19:22:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5E3DC34100; Fri, 13 May 2022 19:22:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652469736; bh=58go8GPbXMYyu0T5j7PnohiQuD1mG7nkVQ8e/VS1C4g=; h=Date:To:From:Subject:From; b=Iu06g+9yRwBn261EoRNYWAcltgO32VquOSn7fSAZJAV8qQI13Pkzumyj30VfuJfCE yCR1fmi2hjtJKp/oJZqD5QHcX6eUu8o14g507gp2KOYNy+h9lIOmexqQT7JXsIG2Em cQysRwYCPd9SwqGaMKFUoRjraPZjHqAZa/P27DWk= Date: Fri, 13 May 2022 12:22:16 -0700 To: mm-commits@vger.kernel.org, zhaochongxi2019@email.szu.edu.cn, zhangyinan2019@email.szu.edu.cn, yuhongf@szu.edu.cn, yejiajian2018@email.szu.edu.cn, liuyongqiang13@huawei.com, hanshenghong2019@email.szu.edu.cn, corbet@lwn.net, caoyixuan2019@email.szu.edu.cn, baihaowen@meizu.com, akiyks@gmail.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] docs-vm-page_owner-tweak-literal-block-in-standard-format-specifiers.patch removed from -mm tree Message-Id: <20220513192216.A5E3DC34100@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: docs: vm/page_owner: tweak literal block in STANDARD FORMAT SPECIFIERS has been removed from the -mm tree. Its filename was docs-vm-page_owner-tweak-literal-block-in-standard-format-specifiers.patch This patch was dropped because it was merged into the mm-stable branch\nof git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Akira Yokosawa Subject: docs: vm/page_owner: tweak literal block in STANDARD FORMAT SPECIFIERS A semantic conflict between commit 5603f9bdea68 ("docs: vm/page_owner: use literal blocks for param description") and a change queued for v5.19 authored by Jiajian Ye ("tools/vm/page_owner_sort.c: support sorting blocks by multiple keys") results in a warning from "make htmldocs" saying: [...]/vm/page_owner.rst:176: WARNING: Literal block expected; none found. This is because a literal block in ReST ends at a line which has the same indent as the paragraph preceding it. In this case the one with no indent. Indent the two "For --xxxx option:" lines by two columns and make the whole section a literal block. While at it, fix indents by white spaces of "ator" keys. Link: https://lkml.kernel.org/r/fdfecc82-d41e-6d8a-738d-4beb6faa27fb@gmail.com Signed-of-by: Akira Yokosawa Reported-by: Shenghong Han Cc: Jiajian Ye Cc: Chongxi Zhao Cc: Yinan Zhang Cc: Yixuan Cao Cc: Yongqiang Liu Cc: Yuhong Feng Cc: Haowen Bai Cc: Jonathan Corbet Signed-off-by: Andrew Morton --- Documentation/vm/page_owner.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/Documentation/vm/page_owner.rst~docs-vm-page_owner-tweak-literal-block-in-standard-format-specifiers +++ a/Documentation/vm/page_owner.rst @@ -173,7 +173,7 @@ STANDARD FORMAT SPECIFIERS ========================== :: -For --sort option: + For --sort option: KEY LONG DESCRIPTION p pid process ID @@ -183,9 +183,9 @@ For --sort option: T txt full text of block ft free_ts timestamp of the page when it was released at alloc_ts timestamp of the page when it was allocated - ator allocator memory allocator for pages + ator allocator memory allocator for pages -For --curl option: + For --curl option: KEY LONG DESCRIPTION p pid process ID @@ -193,4 +193,4 @@ For --curl option: n name task command name f free whether the page has been released or not st stacktrace stack trace of the page allocation - ator allocator memory allocator for pages + ator allocator memory allocator for pages _ Patches currently in -mm which might be from akiyks@gmail.com are