lkml.org 
[lkml]   [2023]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the rust tree with the kunit-next tree
On Tue, Aug 22, 2023 at 8:23 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:

Yeah, we expected this one when we applied an extra patch series
yesterday. I tested the merged trees to double-check the (now tested)
examples pass (i.e. the KUnit tree has a patch series which enables
the testing of the examples in the documentation of Rust code).

> - /// # use kernel::{macros::pin_data, pin_init};
> -/// # use kernel::pin_init;
> -/// # use macros::{Zeroable, pin_data};
> ++/// # use kernel::{macros::Zeroable, pin_data, pin_init};

Almost right :) It should be:

/// # use kernel::{macros::{Zeroable, pin_data}, pin_init};

In case it helps for future similar conflicts, the reason is that
there are 3 things we are "using" here:

kernel::macros::Zeroable
kernel::macros::pin_data
kernel::pin_init

Instead, the current resolution would mean:

kernel::macros::Zeroable
kernel::pin_data
kernel::pin_init

Thanks Stephen!

Cheers,
Miguel

\
 
 \ /
  Last update: 2023-08-22 10:16    [W:0.118 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site