linux-kernel - linux-next: manual merge of 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: <20200311120742.074ca2ff@canb.auug.org.au>
Date:   Wed, 11 Mar 2020 12:07:42 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>,
        Masahiro Yamada <masahiroy@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>
Subject: linux-next: manual merge of the jc_docs tree with the kbuild tree

Hi all,

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

  Documentation/kbuild/index.rst

between commit:

  fcf1b6a35c16 ("Documentation/llvm: add documentation on building w/ Clang/LLVM")

from the kbuild tree and commit:

  2b4cbd5c9505 ("docs: move gcc-plugins to the kbuild manual")

from the jc_docs 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/kbuild/index.rst
index 3882bd5f7728,82daf2efcb73..000000000000
--- a/Documentation/kbuild/index.rst
+++ b/Documentation/kbuild/index.rst
@@@ -19,7 -19,7 +19,8 @@@ Kernel Build Syste

      issues
      reproducible-builds
 +    llvm
+     gcc-plugins

  .. only::  subproject and html

Content of type "application/pgp-signature" skipped