]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
Merge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@kernel.org>
Fri, 29 Jul 2016 14:53:50 +0000 (16:53 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 29 Jul 2016 14:53:50 +0000 (16:53 +0200)
commit9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d
tree509034188b1438ddd9f572e378caf69d0866bd12
parente4b3e0694bbc0350251e22abc215a7ff506f9162
parent8149a774d53afeaf5eb337a813f828f8b8ce68da
Merge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Fix the tools/vm/ build by making libapi provide the str_error_c function,
   that libapi uses but wasn't part of the list of objects linked with
   tools/vm/ programs.  (Arnaldo Carvalho de Melo)

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