linux-kernel - linux-next: manual merge of the driver-core tree with the vfs-brauner 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-next>] [day] [month] [year] [list]

Message-ID: <20250624144231.3598eb5e@canb.auug.org.au>
Date: Tue, 24 Jun 2025 14:42:31 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Christian Brauner <brauner@...nel.org>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Danilo Krummrich <dakr@...nel.org>,
 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 driver-core tree with the
 vfs-brauner tree

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  rust/helpers/helpers.c

between commit:

  6efbf978891b ("poll: rust: allow poll_table ptrs to be null")

from the vfs-brauner tree and commit:

  a2801affa710 ("rust: device: Create FwNode abstraction for accessing device properties")

from the driver-core 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 d2887e3b2826,393ad201befb..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -32,7 -32,7 +32,8 @@@
  #include "platform.c"
  #include "pci.c"
  #include "pid_namespace.c"
 +#include "poll.c"
+ #include "property.c"
  #include "rbtree.c"
  #include "rcu.c"
  #include "refcount.c"

Content of type "application/pgp-signature" skipped