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
Date: Thu, 11 Apr 2024 09:42:56 +1000 [thread overview]
Message-ID: <20240411094256.08b7d7b9@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-04-10 23:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 23:42 Stephen Rothwell [this message]
2024-04-11 10:47 ` linux-next: manual merge of the risc-v tree with the rust-fixes tree Miguel Ojeda
2024-04-11 19:59 ` Palmer Dabbelt
2024-04-11 20:43 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240411094256.08b7d7b9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=conor.dooley@microchip$(echo .)com \
--cc=gary@garyguo$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ojeda@kernel$(echo .)org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmer@rivosinc$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=tim.chenbw@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox