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: <20171019113250.uwpyhsxknnva545j@sirena.co.uk>
Date:   Thu, 19 Oct 2017 12:32:50 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Jonathan Corbet <corbet@....net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with Linus' tree

Hi Jonathan,

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

  Documentation/process/index.rst

between commit:

  9ed95129ffcab ("Documentation: Add a file explaining the Linux kernel license enforcement policy")

from Linus' tree and commit:

  13277782dd4bc ("Documentation: add Kernel Driver Statement to the kernel")

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.

diff --cc Documentation/process/index.rst
index 61e43cc3ed17,68454319f006..000000000000
--- a/Documentation/process/index.rst
+++ b/Documentation/process/index.rst
@@@ -25,7 -25,7 +25,8 @@@ Below are the essential guides that eve
     submitting-patches
     coding-style
     email-clients
 +   kernel-enforcement-statement
+    kernel-driver-statement
  
  Other guides to the community that are of interest to most developers are: 
  

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)