linux-kernel - linux-next: manual merge of the rust tree with the ftrace 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: <20241113171334.7ac7a6a6@canb.auug.org.au>
Date: Wed, 13 Nov 2024 17:13:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Steven Rostedt <rostedt@...dmis.org>,
 Masami Hiramatsu <mhiramat@...nel.org>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Danilo Krummrich <dakr@...nel.org>,
 Gary Guo <gary@...yguo.net>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the rust tree with the ftrace tree

Hi all,

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

  scripts/Makefile.build

between commit:

  169484ab6677 ("rust: add arch_static_branch")

from the ftrace tree and commits:

  1f9ed1725456 ("rust: start using the `#[expect(...)]` attribute")
  c95bbb59a9b2 ("rust: enable arbitrary_self_types and remove `Receiver`")
  392e34b6bc22 ("kbuild: rust: remove the `alloc` crate and `GlobalAlloc`")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc scripts/Makefile.build
index 38c7c2602683,2bba59e790b8..000000000000
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@@ -248,7 -248,7 +248,7 @@@ $(obj)/%.lst: $(obj)/%.c FORC
  # Compile Rust sources (.rs)
  # ---------------------------------------------------------------------------
  
- rust_allowed_features := asm_const,asm_goto,new_uninit
 -rust_allowed_features := arbitrary_self_types,lint_reasons
++rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,lint_reasons
  
  # `--out-dir` is required to avoid temporaries being created by `rustc` in the
  # current working directory, which may be not accessible in the out-of-tree

Content of type "application/pgp-signature" skipped