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 181DAC433DF for ; Wed, 3 Jun 2020 19:13:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF9602077D for ; Wed, 3 Jun 2020 19:13:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Im7k4BpW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725961AbgFCTNC (ORCPT ); Wed, 3 Jun 2020 15:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725926AbgFCTNC (ORCPT ); Wed, 3 Jun 2020 15:13:02 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22292C08C5C1 for ; Wed, 3 Jun 2020 12:13:02 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id p21so2356177pgm.13 for ; Wed, 03 Jun 2020 12:13:02 -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=CkoWiDoL/Zq/F+IqZczO+Kwc2nE7mUda1hdD85BeSu0=; b=Im7k4BpWHf5cUhJtjP31WluIRC80Dh4kO15KBgHa7MngYAJYq4Nuo86tXjegge1ieG c58xCtlZzutl1JRhLS2A4MA1G5dTLq9fB8uy90FytHcJBYI3eXXJagFukzzUqBo19fkO WWO4STzP+TmDqTYM4VsmwTGOfF/VGwZapXBJs= 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=CkoWiDoL/Zq/F+IqZczO+Kwc2nE7mUda1hdD85BeSu0=; b=IqC/F0BoBjUYjWsT1RRxQezX8wVlF0Bj8Uv6qpxX5A9BLG6BRzeBSIqhLTdvK3Yj3C 5FDwbhy9TaNtkZGyIlxu0Fa7JSe6PCic9kIOpLNzNqAhKXzfXpOwUhQOt5bbwUGOSQ2+ XZLY9fFNWg0AcOVEruxrTPRLuVn1QeDy7N1sZ9zJ2ETaR+IvZEnFPehDeEGltvweurS9 NV2+Wc7e4bENEjO5qSV7HNhtp6sUVNtIXSFLVpvNdcoPDgL1h21zFYWb2jLIyPmqAsNi mqeMkMq7PziA0wK28ghBtiEgIKHi7leagazlX/wuHovOkPHqfZ5u5dOHtAh/4awsNYp8 BiiA== X-Gm-Message-State: AOAM533tRDC9iUgZmut3oRpaaUaYslku+OMP1Toa4kdmKLo1VVhQOHsI VoT1OR6wOu72mgY6oSsVeSb/sA== X-Google-Smtp-Source: ABdhPJxIstz9B8KRFExR5fLW62d3Pnt2ACFoUcTCLu0REb0tVNc5Zi4u2wL1RDRt2PF3fZ3/q4uaqQ== X-Received: by 2002:a63:554e:: with SMTP id f14mr808751pgm.191.1591211581537; Wed, 03 Jun 2020 12:13:01 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id 9sm3335179pju.1.2020.06.03.12.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 12:13:00 -0700 (PDT) Date: Wed, 3 Jun 2020 12:12:59 -0700 From: Kees Cook To: Mauro Carvalho Chehab Cc: Linux Doc Mailing List , linux-kernel@vger.kernel.org, Jonathan Corbet , Alexey Dobriyan , Andrew Morton , Thomas Gleixner , Luigi Semenzato , Aubrey Li , NeilBrown , Yang Shi , Mark Brown , Catalin Marinas , Daniel Kiss , linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 2/2] docs: fs: proc.rst: fix a warning due to a merge conflict Message-ID: <202006031212.6FDDF5AC18@keescook> References: <28c4f4c5c66c0fd7cbce83fe11963ea6154f1d47.1591137229.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <28c4f4c5c66c0fd7cbce83fe11963ea6154f1d47.1591137229.git.mchehab+huawei@kernel.org> Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Wed, Jun 03, 2020 at 12:38:14AM +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