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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANiq72=DA1A5YyrWAPHEr+by_pac4R0-GemurbLWYNrSAUNSzw@mail.gmail.com>
Date:   Tue, 22 Aug 2023 10:15:44 +0200
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Miguel Ojeda <ojeda@...nel.org>,
        Shuah Khan <skhan@...uxfoundation.org>,
        Brendan Higgins <brendanhiggins@...gle.com>,
        Benno Lossin <benno.lossin@...ton.me>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: 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@...b.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