linux-kernel - linux-next: manual merge of the char-misc tree with the mm-hotfixes 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: <aN-0kfb7trsHUoVS@sirena.org.uk>
Date: Fri, 3 Oct 2025 12:33:37 +0100
From: Mark Brown <broonie@...nel.org>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: Alice Ryhl <aliceryhl@...gle.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	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>,
	Miguel Ojeda <miguel.ojeda.sandonis@...il.com>,
	Wedson Almeida Filho <wedsonaf@...il.com>
Subject: linux-next: manual merge of the char-misc tree with the mm-hotfixes
 tree

Hi all,

Today's linux-next merge of the char-misc tree got conflicts in:

  rust/bindings/bindings_helper.h

between commit:

  081d032d08eac ("mm-ksm-fix-flag-dropping-behavior-in-ksm_madvise-fix")

from the mm-hotfixes tree and commit:

  eafedbc7c050c ("rust_binder: add Rust Binder driver")

from the char-misc 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.

[Sorry, forgot to grab the diff - was a trivial add/add conflict]

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