diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 10:10:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-03 10:10:02 -0800 |
| commit | b37a05c083c85c2657dca9bbe1f5d79dccf756d5 (patch) | |
| tree | 0a9bd376a437484e21a6728ca16f2266a0e3e788 /MAINTAINERS | |
| parent | d5bfb96bdad3588961f49a6eff89a625fbaa12bf (diff) | |
| parent | 12c9d70bd5056b3ae84746fca973c286f48384cc (diff) | |
| download | linux-b37a05c083c85c2657dca9bbe1f5d79dccf756d5.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton: "18 fixes" [ The 18 fixes turned into 17 commits, because one of the fixes was a fix for another patch in the series that I just folded in by editing the patch manually - hopefully correctly - Linus ] * emailed patches from Andrew Morton <akpm@linux-foundation.org>: mm: fix memory leak in copy_huge_pmd() drivers/hwspinlock: fix race between radix tree insertion and lookup radix-tree: fix race in gang lookup mm/vmpressure.c: fix subtree pressure detection mm: polish virtual memory accounting mm: warn about VmData over RLIMIT_DATA Documentation: cgroup-v2: add memory.stat::sock description mm: memcontrol: drop superfluous entry in the per-memcg stats array drivers/scsi/sg.c: mark VMA as VM_IO to prevent migration proc: revert /proc/<pid>/maps [stack:TID] annotation numa: fix /proc/<pid>/numa_maps for hugetlbfs on s390 MAINTAINERS: update Seth email ocfs2/cluster: fix memory leak in o2hb_region_release lib/test-string_helpers.c: fix and improve string_get_size() tests thp: limit number of object to scan on deferred_split_scan() thp: change deferred_split_count() to return number of THP in queue thp: make split_queue per-node
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c245e42cf1d5..24c5b9a29670 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12150,7 +12150,7 @@ F: drivers/net/hamradio/*scc.c F: drivers/net/hamradio/z8530.h ZBUD COMPRESSED PAGE ALLOCATOR -M: Seth Jennings <sjennings@variantweb.net> +M: Seth Jennings <sjenning@redhat.com> L: linux-mm@kvack.org S: Maintained F: mm/zbud.c @@ -12205,7 +12205,7 @@ F: include/linux/zsmalloc.h F: Documentation/vm/zsmalloc.txt ZSWAP COMPRESSED SWAP CACHING -M: Seth Jennings <sjennings@variantweb.net> +M: Seth Jennings <sjenning@redhat.com> L: linux-mm@kvack.org S: Maintained F: mm/zswap.c |