Messages in this thread | | | Date | Fri, 5 Nov 2021 14:39:21 -0400 | From | Steven Rostedt <> | Subject | Re: [GIT PULL] s390 patches for the 5.16 merge window |
| |
On Fri, 5 Nov 2021 19:34:30 +0100 Vasily Gorbik <gor@linux.ibm.com> wrote:
> +++ b/samples/Makefile > @@ -21,6 +21,7 @@ subdir-$(CONFIG_SAMPLE_TIMER) += timers > obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/ > obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ > obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace/ > +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace/ > obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace/ > subdir-$(CONFIG_SAMPLE_UHID) += uhid > obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/ > diff --git a/samples/ftrace/Makefile b/samples/ftrace/Makefile > index ab1d1c05c288..e8a3f8520a44 100644 > --- a/samples/ftrace/Makefile > +++ b/samples/ftrace/Makefile > @@ -3,7 +3,7 @@ > obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct.o > obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-too.o > obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-modify.o > -obj-$(CONFIG_SAMPLE_FTRACE_DIRECT) += ftrace-direct-multi.o > +obj-$(CONFIG_SAMPLE_FTRACE_MULTI_DIRECT) += ftrace-direct-multi.o > > CFLAGS_sample-trace-array.o := -I$(src) > obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o > --
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-- Steve
| |