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

Message-ID: <aMikrcaVbSYdkdmW@tardis-2.local>
Date: Mon, 15 Sep 2025 19:43:41 -0400
From: Boqun Feng <boqun.feng@...il.com>
To: Mark Brown <broonie@...nel.org>
Cc: Yury Norov <yury.norov@...il.com>, Burak Emir <bqe@...gle.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Peter Zijlstra <peterz@...radead.org>,
	Thomas Gleixner <tglx@...utronix.de>, mingo@...nel.org,
	Miguel Ojeda <ojeda@...nel.org>
Subject: Re: linux-next: manual merge of the bitmap tree with the tip tree

[Cc Ingo, Thomas and Miguel for their awareness]

On Mon, Sep 15, 2025 at 11:56:37PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the bitmap tree got a conflict in:
> 
>   rust/helpers/helpers.c
> 
> between commit:
> 
>   ed17707bd8f33 ("rust: sync: Add memory barriers")
> 
> from the tip tree and commits:
> 
>   ae384a4623fc3 ("rust: add bindings for bitops.h")
>   78d9de4ca3474 ("rust: add bindings for bitmap.h")
> 

Thank you for reporting and your resolution looks good to me.

Regards,
Boqun

> from the bitmap 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/helpers/helpers.c
> index a16758a6ef395,abff1ef14d813..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -8,7 -8,8 +8,9 @@@
>    */
>   
>   #include "auxiliary.c"
>  +#include "barrier.c"
> + #include "bitmap.c"
> + #include "bitops.c"
>   #include "blk.c"
>   #include "bug.c"
>   #include "build_assert.c"