linux-kernel - Re: linux-next: build failure after merge of the rust 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 for Android: free password hash cracker in your pocket

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

Message-ID: <CANiq72n05i322FfpSjFX=Wz3-9AgVRKLkKs1CHa-LxzWQ7-pew@mail.gmail.com>
Date: Mon, 17 Mar 2025 23:35:54 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the rust tree

On Mon, Mar 17, 2025 at 11:58 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Presumably this is caused by my merge resolutions :-(  Please have a
> look and let me know what te resolutions should be.

No, it is due to hrtimer-next, which I still have to merge on my side.
I have created an example merge of hrtimer-next into rust-next which
should solve you mention error above -- but please feel free to drop
hrtimer-next today if you prefer, since I will be pushing to rust-next
the proper merge if linux-next goes well, so you will get it:

    https://github.com/ojeda/linux.git rust-next-merge-hrtimer

For the other things mentioned in the other threads, I have also
created two branches, one merging rust-next into Linus, and another
into next-20250317 -- not sure which is the one you usually prefer:

    https://github.com/ojeda/linux.git linus-merge-rust-next
    https://github.com/ojeda/linux.git next-merge-rust-next

It is a bit subtle because we have to "redo" a fix from mainline in 2
different places since the lines of the fix are moved in rust-next.

I build-tested the branches a bit -- I hope they are all OK.

I didn't modify anything in rust-next today to avoid further issues
and get this part over with.

Thanks!

Cheers,
Miguel