linux-kernel - linux-next: manual merge of the tip tree with the jc

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

Message-ID: <20201204153855.13bafa83@canb.auug.org.au>
Date:   Fri, 4 Dec 2020 15:38:55 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Borislav Petkov <bp@...e.de>, Jarkko Sakkinen <jarkko@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Sean Christopherson <sean.j.christopherson@...el.com>
Subject: linux-next: manual merge of the tip tree with the jc_docs tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  Documentation/x86/index.rst

between commit:

  ed13a92d0fde ("docs: archis: add a per-architecture features list")

from the jc_docs tree and commit:

  3fa97bf00126 ("Documentation/x86: Document SGX kernel architecture")

from the tip tree.

I fixed it up (see below) 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

diff --cc Documentation/x86/index.rst
index b4fcb6f258b2,e7eb84484ddc..000000000000
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@@ -33,4 -33,4 +33,5 @@@ x86-specific Documentatio
     i386/index
     x86_64/index
     sva
+    sgx
 +   features

Content of type "application/pgp-signature" skipped