linux-next: manual merge of the driver-core tree with the vfs-brauner tree

Posted by Stephen Rothwell 3 months, 2 weeks ago

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"

Re: linux-next: manual merge of the driver-core tree with the vfs-brauner tree

Posted by Greg KH 3 months, 2 weeks ago

On Tue, Jun 24, 2025 at 02:42:31PM +1000, Stephen Rothwell wrote:
> 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"

Looks good, thanks!