diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-23 22:10:51 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-23 22:10:51 +0900 |
commit | 9f30931a5482d66710210dafe9b4f2cc92320540 (patch) | |
tree | 1b3405d12a1b197d73473ea77c8fb712a632f55c /MAINTAINERS | |
parent | a2c01ed5d46f0686c52272e09f7d2f5be9f573fd (diff) | |
parent | b67de018b37a97548645a879c627d4188518e907 (diff) | |
download | linux-9f30931a5482d66710210dafe9b4f2cc92320540.tar.gz linux-9f30931a5482d66710210dafe9b4f2cc92320540.tar.bz2 linux-9f30931a5482d66710210dafe9b4f2cc92320540.zip |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"9 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put
fault-inject: fix inverted interval/probability values in printk
lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y
mm: make sendfile(2) killable
thp: use is_zero_pfn() only after pte_present() check
mailmap: update Javier Martinez Canillas' email
MAINTAINERS: add Sergey as zsmalloc reviewer
mm: cma: fix incorrect type conversion for size during dma allocation
kmod: don't run async usermode helper as a child of kworker thread
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ddc88c089c48..9de185da5f5b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11675,6 +11675,7 @@ F: drivers/tty/serial/zs.* ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR M: Minchan Kim <minchan@kernel.org> M: Nitin Gupta <ngupta@vflare.org> +R: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> L: linux-mm@kvack.org S: Maintained F: mm/zsmalloc.c |