Merge remote-tracking branch 'torvalds/master' into perf-tools-next

To pick up fixes sent via perf-tools, by Namhyung Kim.

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

diff --cc MAINTAINERS
Simple merge

diff --cc tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h
Simple merge

diff --cc tools/perf/trace/beauty/include/uapi/linux/fs.h
Simple merge

diff --cc tools/perf/trace/beauty/include/uapi/sound/asound.h
Simple merge

diff --cc tools/perf/ui/browsers/annotate.c
Simple merge

diff --cc tools/perf/util/annotate.c
index 7595c8fbc2c5e2d25ec635d39f213b899299a1bc,50ca92255ff62a61e2923179c1e7f4fb7e98ded5..dca2c08ab8c5996a1f7b7480fe4feb2e864402a8
--- 1/tools/perf/util/annotate.c
--- 2/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@@ -906,19 -2461,15 +906,22 @@@ int symbol__annotate(struct map_symbol 
        if (parch)
                *parch = arch;
  
+       if (!list_empty(&notes->src->source))
+               return 0;
+ 
        args.arch = arch;
        args.ms = *ms;
 +
 +      if (notes->src == NULL) {
 +              notes->src = annotated_source__new();
 +              if (notes->src == NULL)
 +                      return -1;
 +      }
 +
        if (annotate_opts.full_addr)
 -              notes->start = map__objdump_2mem(ms->map, ms->sym->start);
 +              notes->src->start = map__objdump_2mem(ms->map, ms->sym->start);
        else
 -              notes->start = map__rip_2objdump(ms->map, ms->sym->start);
 +              notes->src->start = map__rip_2objdump(ms->map, ms->sym->start);
  
        return symbol__disassemble(sym, &args);
  }