From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7077B198E7D; Thu, 6 Jun 2024 14:17:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683455; cv=none; b=rN4jFylU18xUZYhQwsjQv8KzwYO8LA7M4vbhZHL/BxnZEwGG6Uh0U6F/psJGS8ALBCPzbUoEK8hjl/KtQK9foyQZXIYgKcwP4RMLVE27l2RZnbRxOnxcVDuVC2c5q5aEA6kVZ11+LzhAjVW49qr7CT75DDDhukusB7IXLSiD7BE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683455; c=relaxed/simple; bh=GNeMjnqzZWB1SBKR7F3aXU8P9N+su5XT428mWbOLTbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mcqd/LKAYBgkVUJY5kYDdJp0gs2O9isAhoAyCvuiO3So24uH0PAOVR6nNc/q8/t3gBV71zfqMVcly70Z+Y3ts0Q/jFBoLogWhu3+HB+jf174uOY9QAcdh/qFIWU7i61aRaWqHO92DFFvNQGvXjXcR8/hERj6ynB6Ts+IWkQosMk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sbL2bc55; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sbL2bc55" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46E87C2BD10; Thu, 6 Jun 2024 14:17:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683455; bh=GNeMjnqzZWB1SBKR7F3aXU8P9N+su5XT428mWbOLTbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sbL2bc559vlxrgQ9ZVOsvfyMGYIsKBLmK28gJiwLHLKLkwFR2mShdwRo7hq5IxuxO sjlmtNRKovXmaBXWgmehsUr5GPqyXbdRYN34lfhad8OuKmGDAjb9BUckalgs2E+uC2 kRu3VEQVgMTtnhGfJ9lkqTJGLjG68/ZPPqSBxLAE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kan Liang , Namhyung Kim , Adrian Hunter , Ian Rogers , Ingo Molnar , Jin Yao , Jiri Olsa , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.6 400/744] perf annotate: Get rid of duplicate --group option item Date: Thu, 6 Jun 2024 16:01:12 +0200 Message-ID: <20240606131745.288595321@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Namhyung Kim [ Upstream commit 374af9f1f06b5e991c810d2e4983d6f58df32136 ] The options array in cmd_annotate() has duplicate --group options. It only needs one and let's get rid of the other. $ perf annotate -h 2>&1 | grep group --group Show event group information together --group Show event group information together Fixes: 7ebaf4890f63eb90 ("perf annotate: Support '--group' option") Reviewed-by: Kan Liang Signed-off-by: Namhyung Kim Cc: Adrian Hunter Cc: Ian Rogers Cc: Ingo Molnar Cc: Jin Yao Cc: Jiri Olsa Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20240322224313.423181-1-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-annotate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index aeeb801f1ed7b..16757ea9b1a7a 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -589,8 +589,6 @@ int cmd_annotate(int argc, const char **argv) "Enable symbol demangling"), OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel, "Enable kernel symbol demangling"), - OPT_BOOLEAN(0, "group", &symbol_conf.event_group, - "Show event group information together"), OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, "Show a column with the sum of periods"), OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples, -- 2.43.0