linux-kernel - linux-next: manual merge of the crypto 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: <20231218104749.560969bf@canb.auug.org.au>
Date: Mon, 18 Dec 2023 10:47:49 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Herbert Xu <herbert@...dor.apana.org.au>
Cc: Linux Crypto List <linux-crypto@...r.kernel.org>, Hans de Goede
 <hdegoede@...hat.com>, Jonathan Corbet <corbet@....net>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Ma Jun <Jun.Ma2@....com>, Sumit Garg
 <sumit.garg@...aro.org>, Tom Zanussi <tom.zanussi@...ux.intel.com>
Subject: linux-next: manual merge of the crypto tree with the jc_docs,
 wireless-next trees

Hi all,

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

  Documentation/driver-api/index.rst

between commits:

  50709576d81b ("Documentation: Destage TEE subsystem documentation")
  2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism")

from the jc_docs, wireless-next trees and commit:

  8ccc257b29a1 ("crypto: iaa - Add IAA Compression Accelerator Documentation")

from the crypto 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/driver-api/index.rst
index e8e7ee506b13,8b95501cc208..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -112,8 -115,7 +112,9 @@@ available subsections can be seen below
     hte/index
     wmi
     dpll
 +   tee
 +   wbrf
+    crypto/index
  
  .. only::  subproject and html
  

Content of type "application/pgp-signature" skipped