From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:49154 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755935AbcBXDeA (ORCPT ); Tue, 23 Feb 2016 22:34:00 -0500 Subject: Patch "perf trace: Fix documentation for -i" has been added to the 3.14-stable tree To: pfeiner@google.com, acme@redhat.com, dsahern@gmail.com, gregkh@linuxfoundation.org Cc: , From: Date: Tue, 23 Feb 2016 19:23:46 -0800 Message-ID: <1456284226155104@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled perf trace: Fix documentation for -i to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-trace-fix-documentation-for-i.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 956959f6b7a982b2e789a7a8fa1de437074a5eb9 Mon Sep 17 00:00:00 2001 From: Peter Feiner Date: Wed, 4 Nov 2015 09:21:46 -0800 Subject: perf trace: Fix documentation for -i From: Peter Feiner commit 956959f6b7a982b2e789a7a8fa1de437074a5eb9 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- tools/perf/Documentation/perf-trace.txt | 1 - 1 file changed, 1 deletion(-) --- a/tools/perf/Documentation/perf-trace.txt +++ b/tools/perf/Documentation/perf-trace.txt @@ -59,7 +59,6 @@ OPTIONS --verbose=:: Verbosity level. --i:: --no-inherit:: Child tasks do not inherit counters. Patches currently in stable-queue which might be from pfeiner@google.com are queue-3.14/perf-trace-fix-documentation-for-i.patch