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: <CANiq72kwPbHDrR13EWdmWTevU4r9wJzp4exV5rS1x-tD0gh9DA@mail.gmail.com>
Date:   Wed, 23 Aug 2023 18:29:07 +0200
From:   Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To:     Shuah Khan <skhan@...uxfoundation.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Miguel Ojeda <ojeda@...nel.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

Hi Shuah,

On Wed, Aug 23, 2023 at 6:08 PM Shuah Khan <skhan@...uxfoundation.org> wrote:
>
> Is there anything I need to do on my end when I send kunit pull
> request?

On our pull I will let Linus know about the conflict -- perhaps you
can point him to our PR if yours goes out later (when are you sending
it? I was planning to send mine tomorrow) and/or you can tell him the
expected resolution or to look into `linux-next`'s resolution, which
looks good to me:

    https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/rust/kernel/init.rs?h=next-20230823#n529

Cheers,
Miguel