linux-next: manual merge of the char-misc tree with the mm-hotfixes tree

linux-next: manual merge of the char-misc tree with the mm-hotfixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

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]

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the char-misc tree with the mm-hotfixes tree

[Miguel Ojeda]

On Fri, Oct 3, 2025 at 1:33 PM Mark Brown <broonie@kernel.org> wrote:
>
> [Sorry, forgot to grab the diff - was a trivial add/add conflict]

Yeah, accepting both sides is of course good -- I see it in
07586604e097 ("Merge branch 'char-misc-next' of
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git").

Thanks!

Cheers,
Miguel