linux-kernel - Re: linux-next: manual merge of the jc_docs tree with the arm64-fixes tree

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20200424084011.GA3881@gaia>
Date:   Fri, 24 Apr 2020 09:40:12 +0100
From:   Catalin Marinas <catalin.marinas@....com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Jonathan Corbet <corbet@....net>, Will Deacon <will@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Randy Dunlap <rdunlap@...radead.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the
 arm64-fixes tree

Thanks Stephen,

On Fri, Apr 24, 2020 at 12:15:13PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 
>   Documentation/arm64/amu.rst
> 
> between commit:
> 
>   59bff30ad6ce ("Documentation: arm64: fix amu.rst doc warnings")
> 
> from the arm64-fixes tree and commit:
> 
>   d91589556b6a ("docs: amu: supress some Sphinx warnings")
> 
> from the jc_docs tree.

I should have checked whether there is a fix already.

> I fixed it up (I used the former version sonce that seems to be a superset
> of the latter)

I think Randy's version is indeed better, at least the bullet points are
now consistently aligned to the first column throughout the document.

-- 
Catalin