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"

On Tue, Jul 15, 2025 at 10:09 AM Stephen Rothwell <sfr@canb.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