linux-kernel - Re: linux-next: manual merge of the rust tree with the kbuild 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: <CANiq72=5jp-KMmX0jUhaR6G2emVV_w1=onGZamDW0ZRRDM8ipw@mail.gmail.com>
Date: Mon, 17 Mar 2025 20:36:04 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Miguel Ojeda <ojeda@...nel.org>, Masahiro Yamada <masahiroy@...nel.org>, 
	Benno Lossin <benno.lossin@...ton.me>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rust tree with the kbuild tree

On Mon, Mar 17, 2025 at 10:38 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
>   rust/Makefile
>
> between commit:
>
>   e3de46f775ec ("rust: kbuild: skip `--remap-path-prefix` for `rustdoc`")
>
> from the kbuild tree and commit:
>
>   d7659acca7a3 ("rust: add pin-init crate build infrastructure")
>
> from the rust 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.

Looks good to me, thanks!

Cheers,
Miguel