Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Fri, 18 Dec 2015 08:40:13 +0000 (09:40 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 18 Dec 2015 08:40:13 +0000 (09:40 +0100)
commit2d2e7ac14a1f98922e100054bf62715439440f1a
treece93d0a9929f77f1703d0e80f9702058f4cd8ae4
parent03fba21adb190fc0aec9c2556639c1c1b195aee7
parentfb202539e61b14bc63ac29af10fe5d758ecd880a
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent tooling fix from Arnaldo Carvalho de Melo:

  User visible changes:

    - Fix 'perf list' segfault due to lack of support for PERF_CONF_SW_BPF_OUTPUT
      in an array used just for printing available events, robustify the code
      involved (Arnaldo Carvalho de Melo)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>