Merge branch 'perf/urgent' into perf/core

Merge Reason: to pick the fix:

 commit e7f01d1
     perf tools: Use scnprintf where applicable

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc tools/perf/Makefile
Simple merge

diff --cc tools/perf/perf.h
Simple merge

diff --cc tools/perf/util/header.c
Simple merge

diff --cc tools/perf/util/hist.c
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/sort.c
Simple merge

diff --cc tools/perf/util/ui/browsers/hists.c
index c4173c9733bbf44d5e152a9514be49d2475eea92,bb9197c9c4a420d2f0ed83e9dda6994e5961933c..d7a1c4afe28b9089ab09bbf5b7abce623e46a544
--- 1/tools/perf/util/ui/browsers/hists.c
--- 2/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@@ -840,13 -837,10 +840,13 @@@ static int hists__browser_title(struct 
        unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
  
        nr_events = convert_unit(nr_events, &unit);
-       printed = snprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name);
+       printed = scnprintf(bf, size, "Events: %lu%c %s", nr_events, unit, ev_name);
  
 +      if (self->uid_filter_str)
 +              printed += snprintf(bf + printed, size - printed,
 +                                  ", UID: %s", self->uid_filter_str);
        if (thread)
-               printed += snprintf(bf + printed, size - printed,
+               printed += scnprintf(bf + printed, size - printed,
                                    ", Thread: %s(%d)",
                                    (thread->comm_set ? thread->comm : ""),
                                    thread->pid);