linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <aMiZpcBu2LDzwCje@sirena.org.uk>
Date: Mon, 15 Sep 2025 23:56:37 +0100
From: Mark Brown <broonie@...nel.org>
To: Yury Norov <yury.norov@...il.com>
Cc: Boqun Feng <boqun.feng@...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>
Subject: linux-next: manual merge of the bitmap tree with the tip tree

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")

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"

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)