Received-SPF: pass (google.com: domain of linux-crypto+bounces-892-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Mon, 18 Dec 2023 10:47:49 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux Crypto List <linux-crypto@vger.kernel.org>, Hans de Goede
 <hdegoede@redhat.com>, Jonathan Corbet <corbet@lwn.net>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Ma Jun <Jun.Ma2@amd.com>, Sumit Garg
 <sumit.garg@linaro.org>, Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: linux-next: manual merge of the crypto tree with the jc_docs,
 wireless-next trees
Message-ID: <20231218104749.560969bf@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/vGo7X1kCjDbbb56miX44ihq";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/vGo7X1kCjDbbb56miX44ihq
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 mechanis=
m")

from the jc_docs, wireless-next trees and commit:

  8ccc257b29a1 ("crypto: iaa - Add IAA Compression Accelerator Documentatio=
n")

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.

--=20
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
 =20
  .. only::  subproject and html
 =20

--Sig_/vGo7X1kCjDbbb56miX44ihq
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/iKUACgkQAVBC80lX
0Gz4kQf/VtDx149MrnIeJCUf28grp9VB4DFY9wo69h/8rkQFzQG3bEBJi5QZJyUW
8iwmBokpY/744oqkGsrnkJW+vbNOCSDFTB7mqNUJTkAdkrKeh3Wi6B8Wgf1OcwKz
/DMtbGPaFYCLOTJ8zVYgsXYvz0o0HfopBru/CWMtjZ1iWdeHWxyTYOYBYFuybwbC
CDKQ2slGUyKrx5WHznPej7F82i3kbeiNbNdH319CI2dQsfBfYgzURPXHcWBTqsp9
w1PiaSDeIQR8qWUXEWmiZh4GmpxyFaR3e0WzxPH1xU+1rpR25Skdf7sY49m7n4r7
Jx7zExYIGVRv+nlkPplOuVH9d/5Kcw==
=KSZa
-----END PGP SIGNATURE-----

--Sig_/vGo7X1kCjDbbb56miX44ihq--