Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6271C433F5 for ; Tue, 16 Nov 2021 22:43:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88C17619F6 for ; Tue, 16 Nov 2021 22:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231272AbhKPWqV (ORCPT ); Tue, 16 Nov 2021 17:46:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:38798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbhKPWqU (ORCPT ); Tue, 16 Nov 2021 17:46:20 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 35FAC619BB; Tue, 16 Nov 2021 22:43:22 +0000 (UTC) Date: Tue, 16 Nov 2021 17:43:20 -0500 From: Steven Rostedt To: Heiko Carstens Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Olsa Subject: Re: [PATCH 1/2] ftrace/samples: add missing Kconfig option for ftrace direct multi sample Message-ID: <20211116174320.034c8901@gandalf.local.home> In-Reply-To: <20211115195614.3173346-2-hca@linux.ibm.com> References: <20211115195614.3173346-1-hca@linux.ibm.com> <20211115195614.3173346-2-hca@linux.ibm.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 15 Nov 2021 20:56:13 +0100 Heiko Carstens 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 > --- > Acked-by: Steven Rostedt (VMware) -- Steve