linux-kernel - Re: linux-next: manual merge of the rust tree with the vfs-brauner, driver-core trees

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] [day] [month] [year] [list]

Message-ID: <CANiq72m9e4_sGXaXr3Pff=PrD4iLHk9O1zdfPX=83V==iL6rMQ@mail.gmail.com>
Date: Tue, 15 Jul 2025 12:29:31 +0200
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Christian Brauner <brauner@...nel.org>, Greg KH <greg@...ah.com>, 
	Danilo Krummrich <dakr@...nel.org>, "Rafael J. Wysocki" <rafael@...nel.org>, Alice Ryhl <aliceryhl@...gle.com>, 
	Krishna Ketan Rai <prafulrai522@...il.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Remo Senekowitsch <remo@...nzli.dev>
Subject: Re: linux-next: manual merge of the rust tree with the vfs-brauner,
 driver-core trees

On Tue, Jul 15, 2025 at 10:09 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/helpers/helpers.c
>
> between commits:
>
>   6efbf978891b ("poll: rust: allow poll_table ptrs to be null")
>   a2801affa710 ("rust: device: Create FwNode abstraction for accessing device properties")
>
> from the vfs-brauner, driver-core trees and commit:
>
>   8ffb945647f8 ("rust: helpers: sort includes alphabetically")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

Looks good, thanks!

Cheers,
Miguel