Received-SPF: pass (google.com: domain of linux-kernel+bounces-139543-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 11 Apr 2024 09:42:56 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>,
 Miguel Ojeda <ojeda@kernel.org>
Cc: Bo-Wei Chen <tim.chenbw@gmail.com>, Conor Dooley
 <conor.dooley@microchip.com>, Gary Guo <gary@garyguo.net>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>
Subject: linux-next: manual merge of the risc-v tree with the rust-fixes
 tree
Message-ID: <20240411094256.08b7d7b9@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/j3jeFoemNYZhHS36v_A4BYF";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  Documentation/rust/arch-support.rst

between commit:

  01848eee20c6 ("docs: rust: fix improper rendering in Arch Support page")

from the rust-fixes tree and commit:

  81889e8523e6 ("RISC-V: enable building 64-bit kernels with rust support")

from the risc-v 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/rust/arch-support.rst
index c9137710633a,4d1495ded2aa..000000000000
--- a/Documentation/rust/arch-support.rst
+++ b/Documentation/rust/arch-support.rst
@@@ -16,7 -16,8 +16,8 @@@ support corresponds to ``S`` values in=20
  Architecture   Level of support  Constraints
  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
  ``arm64``      Maintained        Little Endian only.
 -``loongarch``  Maintained        -
 +``loongarch``  Maintained        \-
+ ``riscv``      Maintained        ``riscv64`` only.
  ``um``         Maintained        ``x86_64`` only.
  ``x86``        Maintained        ``x86_64`` only.
  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D  =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYXJAAACgkQAVBC80lX
0Gw5qwgAhbSjB91yM5sV+T1z80tkKLqH/cQ2j8bL97C4nttYfu70UG8unMvY2SbB
JXDfjctttZuvZ9br3KImesadu7+ZO/mJ93P8ZdEH/vomvqwWu6oGONilc9WxSKi2
P+7RIvnYtI+l1q92Fh4//33ajVG1m1vRAufUvRMk3FPLn9CEs5wGJu/OjOW2kTPc
NZLh4HAGOzU9xAz6eU+oSxTvDmfBcIrkTTG0MExnCIU/7mgENzRH3HK5b3KOU6nn
L0q40oPD8JNAGehmN0IAfyrge3w1IYNx1ae7PFfTANAo0x+PJ3ZIwTshXHFWc1Iq
/hRxPEoPDtjRBQUfM6N2oXSHR2GmtA==
=Ay4c
-----END PGP SIGNATURE-----

--Sig_/j3jeFoemNYZhHS36v_A4BYF--