* Arnaldo Carvalho de Melo <acme@infradead.org> wrote:

> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Hi Ingo,
> 
> 	Please consider pulling from:
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (3):
>   perf tools: Don't use code surrounded by __KERNEL__
>   perf record: Don't exit in live mode when no tracepoints are enabled
>   perf inject: Refactor read_buildid function
> 
> Tom Zanussi (2):
>   perf/live: don't synthesize build ids at the end of a live mode trace
>   perf: add perf-inject builtin
> 
>  tools/perf/Makefile                    |   17 +--
>  tools/perf/builtin-annotate.c          |    2 +-
>  tools/perf/builtin-buildid-list.c      |    2 +-
>  tools/perf/builtin-diff.c              |    4 +-
>  tools/perf/builtin-inject.c            |  228 ++++++++++++++++++++++++++++++++
>  tools/perf/builtin-kmem.c              |    2 +-
>  tools/perf/builtin-lock.c              |    2 +-
>  tools/perf/builtin-record.c            |   24 ++--
>  tools/perf/builtin-report.c            |    2 +-
>  tools/perf/builtin-sched.c             |    2 +-
>  tools/perf/builtin-timechart.c         |    2 +-
>  tools/perf/builtin-top.c               |    2 +-
>  tools/perf/builtin-trace.c             |    2 +-
>  tools/perf/builtin.h                   |    1 +
>  tools/perf/perf.c                      |    1 +
>  tools/perf/util/bitmap.c               |   21 +++
>  tools/perf/util/header.c               |   96 ++++----------
>  tools/perf/util/header.h               |    2 -
>  tools/perf/util/hweight.c              |   31 +++++
>  tools/perf/util/include/asm/bitops.h   |   18 ---
>  tools/perf/util/include/asm/hweight.h  |    8 +
>  tools/perf/util/include/linux/bitmap.h |   38 +++++-
>  tools/perf/util/include/linux/bitops.h |   20 ++--
>  tools/perf/util/session.c              |    3 +-
>  tools/perf/util/session.h              |    3 +-
>  tools/perf/util/trace-event-read.c     |   19 +++-
>  tools/perf/util/trace-event.h          |    2 +-
>  27 files changed, 407 insertions(+), 147 deletions(-)
>  create mode 100644 tools/perf/builtin-inject.c
>  create mode 100644 tools/perf/util/bitmap.c
>  create mode 100644 tools/perf/util/hweight.c
>  delete mode 100644 tools/perf/util/include/asm/bitops.h
>  create mode 100644 tools/perf/util/include/asm/hweight.h

Pulled, thanks a lot!

	Ingo