linux-kernel - Re: linux-next: build failure after merge of 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANiq72mP15rjfR3cMZH-z9hkTDQfqgEaM4M+71B1KWLmw=3cPA@mail.gmail.com>
Date: Fri, 8 Nov 2024 22:05:30 +0100
From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com>
To: Steven Rostedt <rostedt@...dmis.org>
Cc: Alice Ryhl <aliceryhl@...gle.com>, Stephen Rothwell <sfr@...b.auug.org.au>, 
	Masami Hiramatsu <mhiramat@...nel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, 
	rust-for-linux <rust-for-linux@...r.kernel.org>, Miguel Ojeda <ojeda@...nel.org>
Subject: Re: linux-next: build failure after merge of the ftrace tree

On Fri, Nov 8, 2024 at 9:35 PM Steven Rostedt <rostedt@...dmis.org> wrote:
>
> I can reproduce it with the attached config.

Something like this should work I think:

diff --git a/samples/rust/Makefile b/samples/rust/Makefile
index f29280ec4820..37c15f05cb81 100644
--- a/samples/rust/Makefile
+++ b/samples/rust/Makefile
@@ -2,6 +2,8 @@
 ccflags-y += -I$(src)                          # needed for trace events

 obj-$(CONFIG_SAMPLE_RUST_MINIMAL)              += rust_minimal.o
-obj-$(CONFIG_SAMPLE_RUST_PRINT)                        +=
rust_print.o rust_print_events.o
+
+obj-$(CONFIG_SAMPLE_RUST_PRINT) += rust_print_combined.o
+rust_print_combined-y := rust_print.o rust_print_events.o

 subdir-$(CONFIG_SAMPLE_RUST_HOSTPROGS)         += hostprogs

Cheers,
Miguel