Hi all,

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

  rust/bindings/bindings_helper.h

between commit:

  5b026e341207 ("rust: block: fix generated bindings after refactoring of features")

from the block tree and commit:

  ab44079e2869 ("rust: alloc: add __GFP_HIGHMEM flag")

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/bindings/bindings_helper.h
index 53c996e4bedf,f2bafb10f181..000000000000
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@@ -30,4 -26,4 +30,5 @@@ const gfp_t RUST_CONST_HELPER_GFP_KERNE
  const gfp_t RUST_CONST_HELPER_GFP_KERNEL_ACCOUNT = GFP_KERNEL_ACCOUNT;
  const gfp_t RUST_CONST_HELPER_GFP_NOWAIT = GFP_NOWAIT;
  const gfp_t RUST_CONST_HELPER___GFP_ZERO = __GFP_ZERO;
+ const gfp_t RUST_CONST_HELPER___GFP_HIGHMEM = ___GFP_HIGHMEM;
 +const blk_features_t RUST_CONST_HELPER_BLK_FEAT_ROTATIONAL = BLK_FEAT_ROTATIONAL;

Hi all,

On Tue, 9 Jul 2024 17:52:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the rust tree got a conflict in:
> 
>   rust/bindings/bindings_helper.h
> 
> between commit:
> 
>   5b026e341207 ("rust: block: fix generated bindings after refactoring of features")
> 
> from the block tree and commit:
> 
>   ab44079e2869 ("rust: alloc: add __GFP_HIGHMEM flag")
> 
> 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.
> 
> diff --cc rust/bindings/bindings_helper.h
> index 53c996e4bedf,f2bafb10f181..000000000000
> --- a/rust/bindings/bindings_helper.h
> +++ b/rust/bindings/bindings_helper.h
> @@@ -30,4 -26,4 +30,5 @@@ const gfp_t RUST_CONST_HELPER_GFP_KERNE
>   const gfp_t RUST_CONST_HELPER_GFP_KERNEL_ACCOUNT = GFP_KERNEL_ACCOUNT;
>   const gfp_t RUST_CONST_HELPER_GFP_NOWAIT = GFP_NOWAIT;
>   const gfp_t RUST_CONST_HELPER___GFP_ZERO = __GFP_ZERO;
> + const gfp_t RUST_CONST_HELPER___GFP_HIGHMEM = ___GFP_HIGHMEM;
>  +const blk_features_t RUST_CONST_HELPER_BLK_FEAT_ROTATIONAL = BLK_FEAT_ROTATIONAL;

This is now a conflict between the rust tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

On Tue, Jul 9, 2024 at 9:53 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.

Looks good to me, thanks!

Cheers,
Miguel