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.
--
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
Architecture Level of support Constraints
============= ================ ==============================================
``arm64`` Maintained Little Endian only.
-``loongarch`` Maintained -
+``loongarch`` Maintained \-
+ ``riscv`` Maintained ``riscv64`` only.
``um`` Maintained ``x86_64`` only.
``x86`` Maintained ``x86_64`` only.
============= ================ ==============================================
On Thu, Apr 11, 2024 at 1:43 AM Stephen Rothwell <[email protected]> wrote:
>
> ============= ================ ==============================================
> ``arm64`` Maintained Little Endian only.
> -``loongarch`` Maintained -
> +``loongarch`` Maintained \-
> + ``riscv`` Maintained ``riscv64`` only.
> ``um`` Maintained ``x86_64`` only.
> ``x86`` Maintained ``x86_64`` only.
> ============= ================ ==============================================
Looks good, of course, thanks!
Cheers,
Miguel
On Thu, 11 Apr 2024 03:47:43 PDT (-0700), [email protected] wrote:
> On Thu, Apr 11, 2024 at 1:43 AM Stephen Rothwell <[email protected]> wrote:
>>
>> ============= ================ ==============================================
>> ``arm64`` Maintained Little Endian only.
>> -``loongarch`` Maintained -
>> +``loongarch`` Maintained \-
>> + ``riscv`` Maintained ``riscv64`` only.
>> ``um`` Maintained ``x86_64`` only.
>> ``x86`` Maintained ``x86_64`` only.
>> ============= ================ ==============================================
>
> Looks good, of course, thanks!
Ya, and I think there's not a ton we can do about this one. Just two
in-flight features colliding in the docs, some sort of shared tag seems
overkill.
I'm assuming rust-fixes will make it up to Linus well before I send the RISC-V
for-next (ie, next merge window). So I'll just call this one out when I send
it up.
Thanks!
>
> Cheers,
> Miguel
On Thu, Apr 11, 2024 at 9:59 PM Palmer Dabbelt <[email protected]> wrote:
>
> I'm assuming rust-fixes will make it up to Linus well before I send the RISC-V
> for-next (ie, next merge window). So I'll just call this one out when I send
> it up.
Yeah, sounds good. Thanks!
Cheers,
Miguel