linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20200424121513.0750e300@canb.auug.org.au>
Date:   Fri, 24 Apr 2020 12:15:13 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>,
        Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>
Cc:     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: linux-next: manual merge of the jc_docs tree with the arm64-fixes
 tree

Hi all,

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 fixed it up (I used the former version sonce that seems to be a superset
of the latter) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped