diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-05 23:28:49 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-05 23:28:49 +0400 |
| commit | 42a579a0f960081cd16fc945036e4780c3ad3202 (patch) | |
| tree | 288c8920026c965c5d2e268cb5adae82e00602cc /lib/memory-notifier-error-inject.c | |
| parent | 1d17d17484d40f2d5b35c79518597a2b25296996 (diff) | |
| parent | 8a06bf14008fbf55a86105b8569494f4beeb8762 (diff) | |
| download | linux-42a579a0f960081cd16fc945036e4780c3ad3202.tar.xz | |
Merge branches 'timers-urgent-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timers and perf fixes from Ingo Molnar:
"Timers:
- Fix another timekeeping bug
Pef:
- Make clean brace expansion fix for some shells, from Palmer Cox
- Warn user just once per guest kernel when not finding kernel info,
from David Ahern
- perf test fix from Jiri Olsa
- Fix error handling on event creation in perf top, from David Ahern
- Fix check on perf_target__strnerror, from Namhyung Kim
- Save the whole cmdline, from David Ahern
There's this infrastructure change:
- Prep work for the DWARF CFI post unwinder, so that it doesn't use
perf_session in lots of places, just evlist/evsel is enough.
which is a late infrastructure change that prepare for future feature
work - we wanted it upstream to simplify the fixes/development patch
flows."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Fix adjustment cleanup bug in timekeeping_adjust()
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Remove brace expansion from clean target
perf kvm top: Limit guest kernel info message to once
perf tools: Introduce intlist
perf tools: Change strlist to use the new rblist
perf tools: Introducing rblist
perf kvm: Use strtol for walking guestmount directory
perf tool: Save cmdline from user in file header vs what is passed to record
perf top: Error handling for counter creation should parallel perf-record
perf session: Remove no longer used synthesize_sample method
perf evsel: Adopt parse_sample method from perf_event
perf evlist: Introduce perf_evlist__parse_sample
perf session: Use perf_evlist__id_hdr_size more extensively
perf session: Use perf_evlist__sample_id_all more extensively
perf session: Use perf_evlist__sample_type more extensively
perf evsel: Precalculate the sample size
perf target: Fix check on buffer size
perf symbols: Fix array sizes for binary types arrays
perf test: Fix parse events automated tests
Diffstat (limited to 'lib/memory-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions