From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EF50C433DF for ; Mon, 15 Jun 2020 18:24:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E225D20738 for ; Mon, 15 Jun 2020 18:24:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fT4toYG0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731346AbgFOSYb (ORCPT ); Mon, 15 Jun 2020 14:24:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731341AbgFOSY3 (ORCPT ); Mon, 15 Jun 2020 14:24:29 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B34AAC061A0E for ; Mon, 15 Jun 2020 11:24:29 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id z63so7243666pfb.1 for ; Mon, 15 Jun 2020 11:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pl3r1Mo5DEUisrXbKPOtpyPnis/yzGfz3EgWzAoPwXs=; b=fT4toYG06r37evU/maAh2RirK9WTvH2JEmqWPeB5OgGr2LHf5lvhX5VIreBX5cQcsk 8qyUaqFw1i3A5N7EV7RB0ADb6FLd3LhIiiVfmzCCd+inR5KDOu5P9vHm1tJ9ieLCP2r1 G4EEGO+EPH+3sOrdpbxtwXHgca8jQ+LZN4MNQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pl3r1Mo5DEUisrXbKPOtpyPnis/yzGfz3EgWzAoPwXs=; b=Ofp9neDkRZqT57M7Y+bSje4bHXUZDeQkKkPhyPubtRCQjuzAO0vQSFanIprzBOlxtQ 0GTXl9sjtwWEDRg5CeDjbLE+DAXYrklMz5wrZyUBnpkGXjaqunLNs/qPHePu5ipfQ5X9 oFesfsg+kVPlvaxBTBVtcJu1+Q7oGYz+gW4v2DgQp8yDnGHDHKPYSSY9fuy85Z74w1Fn gk8vDh7CUZDd/RIBaXjbrL1F2A5+oDch3MIislyGtHqANqC0nu2CYdx5CDl/PkfX6seE AJUqIvhQXvVICFFyC6TDCTqGlZpDNlEGe05jYxiw98pt8iNsVRQRX5Qdm/c91iNBZgpV namg== X-Gm-Message-State: AOAM533X2iLKx27Ww3q4HZgn/nQV4y5vDLofeqL8WYlYl8NKUMptGPN/ sWv1UojH5rbYXQQq8OLHkEXA0Q== X-Google-Smtp-Source: ABdhPJz2j5KqTcW1tgWTu2+4lo+i14GErKTSjLBB+uSZ/F60UMMETlkha5A8A0B6bkLa0R7oM7Sg7g== X-Received: by 2002:a62:5ac5:: with SMTP id o188mr24743080pfb.37.1592245469314; Mon, 15 Jun 2020 11:24:29 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id d6sm225015pjh.5.2020.06.15.11.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 11:24:28 -0700 (PDT) Date: Mon, 15 Jun 2020 11:24:27 -0700 From: Kees Cook To: Mauro Carvalho Chehab Cc: Linux Doc Mailing List , linux-kernel@vger.kernel.org, Jonathan Corbet , Alexey Dobriyan , Daniel Kiss , Mark Brown , Catalin Marinas , linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge conflict Message-ID: <202006151124.89C934DDE6@keescook> References: <7d46aec2cb7a5328d260c7c815b9be9737b43ee1.1592203542.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7d46aec2cb7a5328d260c7c815b9be9737b43ee1.1592203542.git.mchehab+huawei@kernel.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Mon, Jun 15, 2020 at 08:47:07AM +0200, Mauro Carvalho Chehab wrote: > Changeset 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps") > added a new parameter to a table. This causes Sphinx warnings, > because there's now an extra "-" at the wrong place: > > /devel/v4l/docs/Documentation/filesystems/proc.rst:548: WARNING: Malformed table. > Text in column margin in table line 29. > > == ======================================= > rd readable > ... > bt - arm64 BTI guarded page > == ======================================= > > Fixes: 424037b77519 ("mm: smaps: Report arm64 guarded pages in smaps") > Fixes: c33e97efa9d9 ("docs: filesystems: convert proc.txt to ReST") > Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Kees Cook -- Kees Cook