linux-kernel - Re: linux-next: manual merge of the char-misc 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] [day] [month] [year] [list]

Message-ID: <aNFkRs5_BK4JSQz2@tardis.local>
Date: Mon, 22 Sep 2025 07:59:18 -0700
From: Boqun Feng <boqun.feng@...il.com>
To: Mark Brown <broonie@...nel.org>
Cc: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
	Alice Ryhl <aliceryhl@...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: Re: linux-next: manual merge of the char-misc tree with the tip tree

On Mon, Sep 22, 2025 at 10:56:40AM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in:
> 
>   rust/helpers/helpers.c
> 
> between commit:
> 
>   d9ea5a41cef80 ("rust: sync: Add memory barriers")
> 
> from the tip 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.
> 
> diff --cc rust/helpers/helpers.c
> index 1c6096f53a6fe,8e8277bdddcae..0000000000000
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@@ -7,9 -7,8 +7,10 @@@
>    * Sorted alphabetically.
>    */
>   
>  +#include "atomic.c"
>   #include "auxiliary.c"
>  +#include "barrier.c"
> + #include "binder.c"
>   #include "blk.c"
>   #include "bug.c"
>   #include "build_assert.c"

LGTM, thanks!

Regards,
Boqun