diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 23:44:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 23:44:48 +0200 |
| commit | 349111f050b54648df9b3e3d70944c56108c6470 (patch) | |
| tree | 5204ec32d8a1099b22efe1354106efbe640ffa35 /.mailmap | |
| parent | Merge tag 'riscv-for-linus-5.9-rc2' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | mm, page_alloc: fix core hung in free_pcppages_bulk() (diff) | |
| download | linux-349111f050b54648df9b3e3d70944c56108c6470.tar.xz linux-349111f050b54648df9b3e3d70944c56108c6470.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"11 patches.
Subsystems affected by this: misc, mm/hugetlb, mm/vmalloc, mm/misc,
romfs, relay, uprobes, squashfs, mm/cma, mm/pagealloc"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, page_alloc: fix core hung in free_pcppages_bulk()
mm: include CMA pages in lowmem_reserve at boot
squashfs: avoid bio_alloc() failure with 1Mbyte blocks
uprobes: __replace_page() avoid BUG in munlock_vma_page()
kernel/relay.c: fix memleak on destroy relay channel
romfs: fix uninitialized memory leak in romfs_dev_read()
mm/rodata_test.c: fix missing function declaration
mm/vunmap: add cond_resched() in vunmap_pmd_range
khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
hugetlb_cgroup: convert comma to semicolon
mailmap: add Andi Kleen
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -32,6 +32,7 @@ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com> Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org> Al Viro <viro@ftp.linux.org.uk> Al Viro <viro@zenIV.linux.org.uk> +Andi Kleen <ak@linux.intel.com> <ak@suse.de> Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com> Andreas Herrmann <aherrman@de.ibm.com> Andrew Morton <akpm@linux-foundation.org> |