tree 6540196a1d3e0b626ca7c3be6708dfd11779814f
parent 529acf58981440eefeaf1451387e2a0aa4825c12
parent 5622c07b4741e0afd7607bce6e850b76eeb23210
author Ingo Molnar <mingo@kernel.org> 1335980014 +0200
committer Ingo Molnar <mingo@kernel.org> 1335980014 +0200
mergetag object 5622c07b4741e0afd7607bce6e850b76eeb23210
 type commit
 tag perf-urgent-for-mingo
 tagger Arnaldo Carvalho de Melo <acme@redhat.com> 1335970702 -0300
 
 Fixes for perf/urgent:
 
 . Add fallback in 'perf stat' for kernels that don't support
   perf_event_attr.exclude_guest, from Stephane Eranian.
 
 . Fix build id cache add routine to take the size of the buffer and not of a
   pointer, from Namhyung Kim.
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJPoU1uAAoJENZQFvNTUqpABnwP/j4rbDJ+3Ck+L5npAWCKbBCn
 g2ubvySCDEbwNBQCUDRUdk7I8Man1NJwKgf/zojpYT/9891pH6ADdWWtxhNjfinl
 QcjrbZDyHflO8BlcXRs0JpVCiSei4FSFXTPPjWPgSu0iCj8xlob3+/OKnrYQvwOQ
 8niRXzh5CWngFfpG3nT0kIehlvAYpvwAOcZz6X0fFXpuv/Ws8HY3NdMOYkYVvMjg
 KRMqjPz80tESM4gDw3V/MmX2M8TBDwrRlH0FZVX1tM790UxcxMHrXoeuUej+Y3ka
 qNzWv2zuv4LcpAyeCCwLvTTcjQ1Cd08LHve46enxjNZESrHZJjs+Bs/TXiQqemYe
 p6qkoDK590PYxA8C/cTVgN5Di9ELEES7bDllaTcezZrLFztnONMXwwWEPiHRCkMz
 +YOBJoCKJ7YX7rGREpn/H52wp5Dc8YFGJKXyO4+1NjbX2irOYFNXuD/YM8W2Rxp0
 H99gwwKgJ5BK3ggxI+XJl8n/4nrEMRysnbwonEmeouffoK85aG7Oo4WUWdx2ZXn7
 I5EJajXLSWzjOvIqoxqbmcWgwpr20fTdl0d5+ML+M1KYB/A4xb0HBk2R9u91nHXi
 QTO1jt2YLlq49jqnjAj1O+X5sRLsJOpxhqQ94AU/gujgkktRHXdzeIJ6oUbTiDT0
 zKH1qEhGTJV8KePgu+ph
 =ixC8
 -----END PGP SIGNATURE-----

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Fixes for perf/urgent:

- Add fallback in 'perf stat' for kernels that don't support
  perf_event_attr.exclude_guest, from Stephane Eranian.

- Fix build id cache add routine to take the size of the buffer and not of a
  pointer, from Namhyung Kim.

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