linux-kernel - Re: linux-next: manual merge of the rust tree with the block 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-prev] [day] [month] [year] [list]

Message-ID: <20240724091900.155776f1@canb.auug.org.au>
Date: Wed, 24 Jul 2024 09:19:00 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>
Cc: Jens Axboe <axboe@...nel.dk>, Alice Ryhl <aliceryhl@...gle.com>, Andreas
 Hindborg <a.hindborg@...sung.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rust tree with the block tree

Hi all,

On Tue, 9 Jul 2024 17:52:55 +1000 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped