tree eee276fd27aeae2e92e2aff91cb4a3af87a792fa
parent 4ba792e303e278052bb0ee60cce15d6d7dc15c7c
parent f06cff7c59b6b252d667435d7baad48687b41002
author Ingo Molnar <mingo@kernel.org> 1445588757 +0200
committer Ingo Molnar <mingo@kernel.org> 1445588757 +0200
mergetag object f06cff7c59b6b252d667435d7baad48687b41002
 type commit
 tag perf-core-for-mingo
 tagger Arnaldo Carvalho de Melo <acme@redhat.com> 1445548952 -0300
 
 perf/core improvements and fixes:
 
 User visible:
 
 - The default for callchains is back to 'callee' when --children is not used,
   (Namhyung Kim)
 
 - Move the 'use_offset' option to the right place where the annotate code
   expects it to be to be able to properly handle it (Namhyung Kim)
 
 - Don't die when an unknown 'annotate' option is found in the perf config
   file (usually ~/.perfconfig), just warn the user (Arnaldo Carvalho de Melo)
 
 Infrastructure:
 
 - Support %ps/%pS in libtraceevent (Scott Wood)
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWKVS9AAoJENZQFvNTUqpAUnIP/1vQdPG9mr3RsCsHysuBxITf
 VTqIVrnGEGLIhTH31eSrVEPcEprTWFrMoh8SRfmqD+BGrqMqt6IvngvFqCaRDQ/i
 uVzmViJiLQp0v9i9J9z4ByxaN3xyRSfoIoTxpxUTnk20SZ7JtlNy/1aUqJTYFhau
 bEZjrpB0vDcEcGANp4V76fvCZC9X5BuS+PI+95qgptJ22kIJEL+cnayiudTfhbhS
 HSpBKWpXLGkp1ohB/+fq+pt3AenXPvjO7M2M3lERb9PpWF4bS384JYDpcpitxPQJ
 PZWZiGhaGSJ7rDaODj11Zt9bRbK3QOCejwXTbDyq3teocmTV6FqnTXKe66tIQFjV
 oapu3tbUuaRVUt1uo8BkHK78nnI2vxvYW/qcFYQqmjotA0WBSff30RRTrhuo4vpZ
 xixBrsu22tNk9F7yyl5o69am1IDr3onduFEYr8Jcpt1BYOnoRJa2/FSveLBqK64Z
 2kN2/Ws7i2J4ux5LwU+qEz/NFu/+2SgQz+GF0DBRm63bnePOs216mKM3cdYerbtO
 yiEdpmoanDRUpxfMcXtgxlrEfcnZCfUPyPlaBO446/kX/ghLx6gOQZqkFUc2C0Dw
 zIXDjL1iOmIEmTai+pwxAFvkHYBS5arBHC0T+lEupTrFEen97xIhZ6J1Af/8vV50
 F+VEpKqlD4jgZQQOL10e
 =yDyE
 -----END PGP SIGNATURE-----

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

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

  - The default for callchains is back to 'callee' when --children is not used.
    (Namhyung Kim)

  - Move the 'use_offset' option to the right place where the annotate code
    expects it to be to be able to properly handle it. (Namhyung Kim)

  - Don't die when an unknown 'annotate' option is found in the perf config
    file (usually ~/.perfconfig), just warn the user. (Arnaldo Carvalho de Melo)

Infrastructure changes:

  - Support %ps/%pS in libtraceevent. (Scott Wood)

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