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
Attachment:
pgpDKKaxhhi7S.pgp
Description: OpenPGP digital signature
