linux-next: manual merge of the rust tree with the opp tree

linux-next: manual merge of the rust tree with the opp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

Hi all,

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

  rust/kernel/opp.rs

between commit:

  e6fdbe8feace ("rust: opp: fix broken rustdoc link")

from the opp tree and commit:

  965a39a9627b ("rust: opp: use `CStr::as_char_ptr`")

from the rust 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 rust/kernel/opp.rs
index 04472a8de3ff,9d6c58178a6f..000000000000
--- a/rust/kernel/opp.rs
+++ b/rust/kernel/opp.rs
@@@ -87,8 -87,8 +87,8 @@@ use core::{marker::PhantomData, ptr}
  
  use macros::vtable;
  
 -/// Creates a null-terminated slice of pointers to [`Cstring`]s.
 +/// Creates a null-terminated slice of pointers to [`CString`]s.
- fn to_c_str_array(names: &[CString]) -> Result<KVec<*const u8>> {
+ fn to_c_str_array(names: &[CString]) -> Result<KVec<*const c_char>> {
      // Allocated a null-terminated vector of pointers.
      let mut list = KVec::with_capacity(names.len() + 1, GFP_KERNEL)?;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the rust tree with the opp tree

[Miguel Ojeda]

On Thu, Oct 23, 2025 at 3:49 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks!

Cheers,
Miguel