linux-kernel - Re: [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge conflict

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200615111749.GA4447@sirena.org.uk>
Date:   Mon, 15 Jun 2020 12:17:49 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Cc:     Linux Doc Mailing List <linux-doc@...r.kernel.org>,
        linux-kernel@...r.kernel.org, Jonathan Corbet <corbet@....net>,
        Alexey Dobriyan <adobriyan@...il.com>,
        Kees Cook <keescook@...omium.org>,
        Daniel Kiss <daniel.kiss@....com>,
        Catalin Marinas <catalin.marinas@....com>,
        linux-fsdevel@...r.kernel.org
Subject: Re: [PATCH 28/29] docs: fs: proc.rst: fix a warning due to a merge
 conflict

On Mon, Jun 15, 2020 at 08:47:07AM +0200, Mauro Carvalho Chehab wrote:
> 	...
> 	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 <mchehab+huawei@...nel.org>
> ---

I acked this when you sent it previously but you've dropped my ack - I'm
not clear what's changed?  The prior ack was in
20200603095428.GA5327@...ena.org.uk.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)