linux-kernel - linux-next: manual merge of the bitmap tree with the char-misc, drm trees

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: <aNEhcEFTsdPXmtVi@finisterre.sirena.org.uk>
Date: Mon, 22 Sep 2025 12:14:08 +0200
From: Mark Brown <broonie@...nel.org>
To: Yury Norov <yury.norov@...il.com>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Boqun Feng <boqun.feng@...il.com>,
	Burak Emir <bqe@...gle.com>,
	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Matt Gilbride <mattgilbride@...gle.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Wedson Almeida Filho <wedsonaf@...il.com>
Subject: linux-next: manual merge of the bitmap tree with the char-misc, drm
 trees

Hi all,

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

  rust/helpers/helpers.c

between commits:

  eafedbc7c050c ("rust_binder: add Rust Binder driver")
  d9ea5a41cef80 ("rust: sync: Add memory barriers")

from the char-misc, drm trees and commits:

  78d9de4ca3474 ("rust: add bindings for bitmap.h")
  ae384a4623fc3 ("rust: add bindings for bitops.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 3d7d0b40c9f13,abff1ef14d813..0000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -7,10 -7,9 +7,12 @@@
   * Sorted alphabetically.
   */
  
 +#include "atomic.c"
  #include "auxiliary.c"
 +#include "barrier.c"
 +#include "binder.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)