Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Date:   Tue, 12 Dec 2023 10:46:57 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Alex Deucher <alexdeucher@gmail.com>,
        Jonathan Corbet <corbet@lwn.net>
Cc:     Hans de Goede <hdegoede@redhat.com>,
        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>
Subject: linux-next: manual merge of the amdgpu tree with the jc_docs tree
Message-ID: <20231212104657.524d359e@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nNudTIv73jjuAoRzRQkI/gf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  Documentation/driver-api/index.rst

between commit:

  50709576d81b ("Documentation: Destage TEE subsystem documentation")

from the jc_docs tree and commit:

  2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanis=
m")

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

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV3n3EACgkQAVBC80lX
0Gxi1Af/Y171I44mKx5Cj1rfmUiZsqAxDYk8ugg8oPLht4IMUWgh0tqkKIHZBBEn
ded/9/9oa6ByLkRNEnusVT/z8lTRns3jEPoIbHPQFr8q4nV0V64V/qdDY5pHlZoP
p4OM+tgmLbynzNelTugIL4Lt8mgLEXILqUmjGd+8SE6VODjNKok6o1fKmsAPW7F+
CQuZHJB6PpYDAsnzy2zxCT0eqHrM7MbgKwvbr3/Cpffp0apHkIUS/DYZaxb7UbsH
GkRaAqha9JgL/OoyvJW4vSWyWkAFP3aLoRNrnM6LSN7OvgMcLmstatfTes358CuA
ANeCN6iSo2fCOOUiRrhQHnhC+5KDQA==
=/6WC
-----END PGP SIGNATURE-----

--Sig_/nNudTIv73jjuAoRzRQkI/gf--