On Mon, 15 Nov 2021 20:56:13 +0100
Heiko Carstens <hca@xxxxxxxxxxxxx> wrote:
> Currently it is not possible to build the ftrace direct multi example
> anymore due to broken config dependencies. Fix this by adding
> SAMPLE_FTRACE_DIRECT_MULTI config option.
>
> This broke when merging s390-5.16-1 due to an incorrect merge conflict
> resolution proposed by me.
>
> Also rename SAMPLE_FTRACE_MULTI_DIRECT to SAMPLE_FTRACE_DIRECT_MULTI
> so it matches the module name.
>
> Fixes: 0b707e572a19 ("Merge tag 's390-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux")
> Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx>
> ---
>
Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
-- Steve
