linux-kernel - linux-next: manual merge of the char-misc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170613162341.627e2095@canb.auug.org.au>
Date:   Tue, 13 Jun 2017 16:23:41 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        Jonathan Corbet <corbet@....net>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kees Cook <keescook@...omium.org>,
        Mika Westerberg <mika.westerberg@...ux.intel.com>,
        Andreas Noever <andreas.noever@...il.com>
Subject: linux-next: manual merge of the char-misc tree with the jc_docs
 tree

Hi all,

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

  Documentation/admin-guide/index.rst

between commit:

  504f231cda56 ("doc: ReSTify and split LSM.txt")

from the jc_docs tree and commit:

  163f15115203 ("thunderbolt: Add documentation how Thunderbolt bus can be used")

from the char-misc 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/admin-guide/index.rst
index e14c374aaf60,6d99a7ce6e21..000000000000
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@@ -61,7 -61,7 +61,8 @@@ configure specific aspects of kernel be
     java
     ras
     pm/index
 +   LSM/index
+    thunderbolt
  
  .. only::  subproject and html