Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758358AbbKHHbB (ORCPT ); Sun, 8 Nov 2015 02:31:01 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46020 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752515AbbKHHa6 (ORCPT ); Sun, 8 Nov 2015 02:30:58 -0500 Date: Sat, 7 Nov 2015 23:30:47 -0800 From: tip-bot for Peter Feiner Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, dsahern@gmail.com, pfeiner@google.com Reply-To: tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, pfeiner@google.com In-Reply-To: <1446657706-14518-1-git-send-email-pfeiner@google.com> References: <1446657706-14518-1-git-send-email-pfeiner@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf trace: Fix documentation for -i Git-Commit-ID: 956959f6b7a982b2e789a7a8fa1de437074a5eb9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1666 Lines: 42 Commit-ID: 956959f6b7a982b2e789a7a8fa1de437074a5eb9 Gitweb: http://git.kernel.org/tip/956959f6b7a982b2e789a7a8fa1de437074a5eb9 Author: Peter Feiner AuthorDate: Wed, 4 Nov 2015 09:21:46 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 5 Nov 2015 12:47:51 -0300 perf trace: Fix documentation for -i The -i flag was incorrectly listed as a short flag for --no-inherit. It should have only been listed as a short flag for --input. This documentation error has existed since the --input flag was introduced in 6810fc915f7a89d8134edb3996dbbf8eac386c26 (perf trace: Add option to analyze events in a file versus live). Signed-off-by: Peter Feiner Cc: David Ahern Link: http://lkml.kernel.org/r/1446657706-14518-1-git-send-email-pfeiner@google.com Fixes: 6810fc915f7a ("perf trace: Add option to analyze events in a file versus live") Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-trace.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/perf/Documentation/perf-trace.txt b/tools/perf/Documentation/perf-trace.txt index 7ea0786..13293de 100644 --- a/tools/perf/Documentation/perf-trace.txt +++ b/tools/perf/Documentation/perf-trace.txt @@ -62,7 +62,6 @@ OPTIONS --verbose=:: Verbosity level. --i:: --no-inherit:: Child tasks do not inherit counters. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/