* linux-next: manual merge of the risc-v tree with the rust-fixes tree
@ 2024-04-10 23:42 Stephen Rothwell
2024-04-11 10:47 ` Miguel Ojeda
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2024-04-10 23:42 UTC (permalink / raw)
To: Palmer Dabbelt, Paul Walmsley, Miguel Ojeda
Cc: Bo-Wei Chen, Conor Dooley, Gary Guo, Linux Kernel Mailing List,
Linux Next Mailing List, Palmer Dabbelt
[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]
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.
============= ================ ==============================================
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the risc-v tree with the rust-fixes tree
2024-04-10 23:42 linux-next: manual merge of the risc-v tree with the rust-fixes tree Stephen Rothwell
@ 2024-04-11 10:47 ` Miguel Ojeda
2024-04-11 19:59 ` Palmer Dabbelt
0 siblings, 1 reply; 4+ messages in thread
From: Miguel Ojeda @ 2024-04-11 10:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Palmer Dabbelt, Paul Walmsley, Miguel Ojeda, Bo-Wei Chen,
Conor Dooley, Gary Guo, Linux Kernel Mailing List,
Linux Next Mailing List, Palmer Dabbelt
On Thu, Apr 11, 2024 at 1:43 AM Stephen Rothwell <sfr@canb•auug.org.au> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the risc-v tree with the rust-fixes tree
2024-04-11 10:47 ` Miguel Ojeda
@ 2024-04-11 19:59 ` Palmer Dabbelt
2024-04-11 20:43 ` Miguel Ojeda
0 siblings, 1 reply; 4+ messages in thread
From: Palmer Dabbelt @ 2024-04-11 19:59 UTC (permalink / raw)
To: miguel.ojeda.sandonis
Cc: Stephen Rothwell, Paul Walmsley, ojeda, tim.chenbw, Conor Dooley,
gary, linux-kernel, linux-next
On Thu, 11 Apr 2024 03:47:43 PDT (-0700), miguel.ojeda.sandonis@gmail•com wrote:
> On Thu, Apr 11, 2024 at 1:43 AM Stephen Rothwell <sfr@canb•auug.org.au> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the risc-v tree with the rust-fixes tree
2024-04-11 19:59 ` Palmer Dabbelt
@ 2024-04-11 20:43 ` Miguel Ojeda
0 siblings, 0 replies; 4+ messages in thread
From: Miguel Ojeda @ 2024-04-11 20:43 UTC (permalink / raw)
To: Palmer Dabbelt
Cc: Stephen Rothwell, Paul Walmsley, ojeda, tim.chenbw, Conor Dooley,
gary, linux-kernel, linux-next
On Thu, Apr 11, 2024 at 9:59 PM Palmer Dabbelt <palmer@rivosinc•com> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-11 20:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-10 23:42 linux-next: manual merge of the risc-v tree with the rust-fixes tree Stephen Rothwell
2024-04-11 10:47 ` Miguel Ojeda
2024-04-11 19:59 ` Palmer Dabbelt
2024-04-11 20:43 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox