diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-28 11:42:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-28 11:42:56 -0700 |
| commit | ea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83 (patch) | |
| tree | 59c4199a71da59a4ee917ae06d4b49f6684bd3f7 /tools/perf/scripts/python/stackcollapse.py | |
| parent | Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL (diff) | |
| parent | proc: add Alexey to MAINTAINERS (diff) | |
| download | linux-ea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83.tar.gz linux-ea5f39f2f994e6fb8cb8d0304aa5f422ae3bbf83.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
proc: add Alexey to MAINTAINERS
kasan: depend on CONFIG_SLUB_DEBUG
include/linux/dax.h: dax_iomap_fault() returns vm_fault_t
x86/e820: put !E820_TYPE_RAM regions into memblock.reserved
slub: fix failure when we delete and create a slab cache
Revert mm/vmstat.c: fix vmstat_update() preemption BUG
lib/percpu_ida.c: don't do alloc from per-CPU list if there is none
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions