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

[Stephen Rothwell]

Hi Miguel,

On Tue, 22 Aug 2023 10:15:44 +0200 Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx> wrote:
>
> On Tue, Aug 22, 2023 at 8:23 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 for the explanation.  I have updated my resolution for tomorrow.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpqAzAxt2u4r.pgp
Description: OpenPGP digital signature