linux-kernel - 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20250715180913.735698ce@canb.auug.org.au>
Date: Tue, 15 Jul 2025 18:09:13 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: 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>
Cc: 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: linux-next: manual merge of the rust tree with the vfs-brauner,
 driver-core trees

Hi all,

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
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc rust/helpers/helpers.c
index 2d2ea06000e9,d3867d09e356..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -28,13 -28,10 +28,13 @@@
  #include "kunit.c"
  #include "mm.c"
  #include "mutex.c"
 +#include "of.c"
  #include "page.c"
- #include "platform.c"
  #include "pci.c"
  #include "pid_namespace.c"
+ #include "platform.c"
 +#include "poll.c"
 +#include "property.c"
  #include "rbtree.c"
  #include "rcu.c"
  #include "refcount.c"

Content of type "application/pgp-signature" skipped