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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 45E73C433DF for ; Wed, 3 Jun 2020 09:54:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1901620734 for ; Wed, 3 Jun 2020 09:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591178080; bh=oeMBR71zS+pMyX9v0fj7F0CkiuWzgIrRNVOKUGSXlBw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=ge6GdKYCTmEKAAsSyw23hoelMLSHxLTykgidgyBWOLhlH80Wnjy3yQWz6sRB7+zV7 DXLeSMjVe/XQGjNVm99fjDHY7TY97iBBhNZgFV2UJQ9zz2934VXNCs3Y01r6gPdikX ijbFQCdxrSLBff1aoP2eQCY5wjn8U9SGgF3qo13g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726123AbgFCJyc (ORCPT ); Wed, 3 Jun 2020 05:54:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:60500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbgFCJyb (ORCPT ); Wed, 3 Jun 2020 05:54:31 -0400 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (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 97A49206A2; Wed, 3 Jun 2020 09:54:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591178071; bh=oeMBR71zS+pMyX9v0fj7F0CkiuWzgIrRNVOKUGSXlBw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=1j09JU8SfYxzcB1rwjgcwH0ZOPQVPHj6TI+nzcBNAFm7EjL8s1ouPqNgoWrY3gs+d n3350osjIgPNmYoinUdlA5il9X6PZJBitrjbEk1CvbaLGLPLWEZaKleJOO3XhfRSXB aan+nEcRRWKKhwD80fElz3jqPv1xqeZKSWnzM5lA= Date: Wed, 3 Jun 2020 10:54:28 +0100 From: Mark Brown 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 , Catalin Marinas , Daniel Kiss , Kees Cook , linux-fsdevel@vger.kernel.org Subject: Re: [PATCH 2/2] docs: fs: proc.rst: fix a warning due to a merge conflict Message-ID: <20200603095428.GA5327@sirena.org.uk> References: <28c4f4c5c66c0fd7cbce83fe11963ea6154f1d47.1591137229.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw" Content-Disposition: inline In-Reply-To: <28c4f4c5c66c0fd7cbce83fe11963ea6154f1d47.1591137229.git.mchehab+huawei@kernel.org> X-Cookie: Your supervisor is thinking about you. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org --GvXjxJ+pjyke8COw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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: Acked-by: Mark Brown --GvXjxJ+pjyke8COw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl7Xc1AACgkQJNaLcl1U h9CkuAf7BQEahHNY2RtCJ0oStk4GzPzgDuhtsL9o2vxq/A5/CNTfmJ6l3lwIzV6p RTSoNwkaoN8gXO+tYG14vho8aO4FKLeJKZLUHbwbJkcLDdtDO5uDIH0/Kq2pwJOM fB6OEiVinHkdFwCmeOClv51/2hX0QzfJpzEo0AsPiOryDA+Rbv/KvuKk/W69lZw/ E0unmZ9MEH7Dq6zssY/Q+ORvpaSmu7MnbUnRpHDmjtqavrnYfCVnZWUF+GhyjO1E Z9W9iD3N/pIpvUInOfhkGsFjKxZtwX+tKVoYJ3B5/gFjg05wrJXNKqY0Z5CmLsgw s7dSHPu0BPmIpaCy/6HTAsu5jtgynQ== =XRbF -----END PGP SIGNATURE----- --GvXjxJ+pjyke8COw--