[4.2.y-ckt stable] Patch "perf annotate: Fix 'annotate.use_offset' config variable usage" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    perf annotate: Fix 'annotate.use_offset' config variable usage

to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue

This patch is scheduled to be released in version 4.2.8-ckt1.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 4.2.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 16a542a1ffabc9deb6671085d3555da3f29d94d8 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung at kernel.org>
Date: Wed, 21 Oct 2015 11:57:20 +0900
Subject: perf annotate: Fix 'annotate.use_offset' config variable usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 39ff7cdb5a5e6b75dd049255615828c6531cd109 upstream.

The annotate__configs should be sorted so that it can use bsearch(3).

However commit 0c4a5bcea460 ("perf annotate: Display total number of
samples with --show-total-period") added a new config item at the end.
This resulted in the 'annotate.use_offset' config variable cannot be
found and perf terminated like below:

  $ perf report
  bad config file line 6 in ~/.perfconfig

Signed-off-by: Namhyung Kim <namhyung at kernel.org>
Cc: David Ahern <dsahern at gmail.com>
Cc: Jiri Olsa <jolsa at redhat.com>
Cc: Martin Liška <mliska at suse.cz>
Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
Cc: Taeung Song <treeze.taeung at gmail.com>
Fixes: 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")
Link: http://lkml.kernel.org/r/1445396240-3428-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 tools/perf/ui/browsers/annotate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 5995a8b..ebca255 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -1030,8 +1030,8 @@ static struct annotate_config {
 	ANNOTATE_CFG(jump_arrows),
 	ANNOTATE_CFG(show_linenr),
 	ANNOTATE_CFG(show_nr_jumps),
-	ANNOTATE_CFG(use_offset),
 	ANNOTATE_CFG(show_total_period),
+	ANNOTATE_CFG(use_offset),
 };

 #undef ANNOTATE_CFG
--
1.9.1